Skip to content

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

租车确认订单

parent f5c734e3
Show whitespace changes
Inline Side-by-side
Showing with 729 additions and 514 deletions
module_home/build.gradle
View file @ 2ff9794d
......@@ -39,10 +39,12 @@ dependencies {
api project(':component_resource')
api project(':component_dialog')
api project(':component_utils')
api project(':component_control')
api project(':plugin_search')
api project(':RvWrapper')
// api project(':RvTravel')
annotationProcessor'com.alibaba:arouter-compiler:1.1.4'
implementation 'com.alibaba:fastjson:1.2.21'
}
module_home/src/main/java/com/rv/home/rv/module/ApiConfig.java
View file @ 2ff9794d
......@@ -48,6 +48,7 @@ public class ApiConfig {
public static String HTTP_URL_GETTOURUSERLIST = RvFrameConfig.VEHICLE_TOURUSER + "tourUser/app/unauth/getTourUserList";//获得全部出游人信息
public static String HTTP_URL_ADDANDUPDATE = RvFrameConfig.VEHICLE_TOURUSER + "tourUser/app/addAndUpdate";//添加和更新出游人信息
public static String HTTP_URL_CAR_TYPE_NOTICE = RvFrameConfig.HOST + "/h5/appHtml/view/notice.html";//预定须知
public static String HTTP_URL_COLLECTONLIST = RvFrameConfig.ADMIN_POST + "app/user/collect/page";//我的收藏列表
public static String HTTP_URL_SCORE = RvFrameConfig.HOST + "/vehicle/vehicleUserScore/score";//订单评价保存
......
module_home/src/main/java/com/rv/home/rv/module/ui/login/BingPhoneActivity.java
View file @ 2ff9794d
......@@ -18,6 +18,7 @@ import com.rv.home.R;
import com.rv.home.R2;
import com.rv.home.rv.module.ApiConfig;
import com.rv.home.rv.module.basic.BaseLoginActivity;
import com.rv.home.rv.module.basic.bean.BeanUserInfo;
import com.rv.home.rv.module.basic.presenter.CommonPresenter;
import com.rv.home.rv.module.ui.login.bean.CheckLoginBean;
import com.rv.home.rv.module.ui.login.bean.RegisteredBean;
......@@ -117,6 +118,9 @@ public class BingPhoneActivity extends BaseLoginActivity<CommonPresenter> {
case 2:
processLoginData((RegisteredBean) result);
break;
case 10:
setDataUser((BeanUserInfo)result);
break;
}
}
......
module_home/src/main/java/com/rv/home/rv/module/ui/login/ConfirmPwdActivity.java
View file @ 2ff9794d
......@@ -17,6 +17,7 @@ import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.util.listener.TextChangedListener;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.home.rv.module.basic.BaseLoginActivity;
import com.rv.home.rv.module.basic.bean.BeanUserInfo;
import com.rv.home.rv.module.basic.presenter.CommonPresenter;
import com.rv.home.rv.module.ui.login.bean.RegisteredBean;
import com.umeng.socialize.bean.SHARE_MEDIA;
......@@ -99,6 +100,8 @@ public class ConfirmPwdActivity extends BaseLoginActivity<CommonPresenter> {
public void onShowResult(int requestType, BaseBean result) {
if (requestType == 2) {
processLoginData((RegisteredBean) result);
}else if (requestType == 10){
setDataUser((BeanUserInfo)result);
}
}
......
module_home/src/main/java/com/rv/home/rv/module/ui/login/LoginRvActivity.java
View file @ 2ff9794d
......@@ -26,6 +26,7 @@ import com.rv.home.R2;
import com.frame.rv.config.RvFrameConfig;
import com.rv.home.rv.module.ApiConfig;
import com.rv.home.rv.module.basic.BaseLoginActivity;
import com.rv.home.rv.module.basic.bean.BeanUserInfo;
import com.rv.home.rv.module.basic.presenter.CommonPresenter;
import com.rv.home.rv.module.ui.login.bean.RegisteredBean;
import com.rv.home.rv.module.ui.login.bean.SendCodeBean;
......@@ -115,6 +116,9 @@ public class LoginRvActivity extends BaseLoginActivity<CommonPresenter> {
case 2:
processLoginData((RegisteredBean) result);
break;
case 10:
setDataUser((BeanUserInfo)result);
break;
}
}
......
module_home/src/main/java/com/rv/home/rv/module/ui/login/PwdLoginActivity.java
View file @ 2ff9794d
......@@ -18,6 +18,7 @@ import com.rv.home.R;
import com.rv.home.R2;
import com.rv.home.rv.module.ApiConfig;
import com.rv.home.rv.module.basic.BaseLoginActivity;
import com.rv.home.rv.module.basic.bean.BeanUserInfo;
import com.rv.home.rv.module.basic.presenter.CommonPresenter;
import com.rv.home.rv.module.ui.login.bean.RegisteredBean;
import com.umeng.socialize.bean.SHARE_MEDIA;
......@@ -71,6 +72,8 @@ public class PwdLoginActivity extends BaseLoginActivity<CommonPresenter> {
public void onShowResult(int requestType, BaseBean result) {
if (requestType == 0) {
processLoginData((RegisteredBean) result);
}else if (requestType == 10){
setDataUser((BeanUserInfo)result);
}
}
......
module_home/src/main/java/com/rv/home/rv/module/ui/login/RegisteredActivity.java
View file @ 2ff9794d
......@@ -22,6 +22,7 @@ import com.rv.home.R;
import com.rv.home.R2;
import com.rv.home.rv.module.ApiConfig;
import com.rv.home.rv.module.basic.BaseLoginActivity;
import com.rv.home.rv.module.basic.bean.BeanUserInfo;
import com.rv.home.rv.module.basic.presenter.CommonPresenter;
import com.rv.home.rv.module.ui.login.bean.RegisteredBean;
import com.rv.home.rv.module.ui.login.bean.SendCodeBean;
......@@ -106,6 +107,9 @@ public class RegisteredActivity extends BaseLoginActivity<CommonPresenter> {
case 1:
processLoginData((RegisteredBean) result);
break;
case 10:
setDataUser((BeanUserInfo) result);
break;
}
}
......@@ -239,7 +243,7 @@ public class RegisteredActivity extends BaseLoginActivity<CommonPresenter> {
* @return
*/
private String getAgainPwd() {
return etPwd.getText().toString().trim();
return etAgainPwd.getText().toString().trim();
}
;
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/CarDetailActivity.java
View file @ 2ff9794d
......@@ -87,7 +87,7 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
tvTitleCenter.setText("车辆详情");
webUrl = ApiConfig.HTTP_URL_CAR_TYPE_DETAIL + "?id=" + mCarBean.getVehicleModel().getId() + "&companyId=" + mCarBean.getCompany().getId();
initWeb();
initShare(webUrl, mCarBean.getVehicleModel().getName(), mCarBean.getCompany().getAddrDetail(), mCarBean.getVehicleModel().getPicture());
initShare(webUrl, mCarBean.getVehicleModel().getName(), mCarBean.getCompany().getAddrDetail(), mCarBean.getVehicleModel().getIcon());
}
@Override
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/CarRentalListActivity.java
View file @ 2ff9794d
......@@ -229,32 +229,6 @@ public class CarRentalListActivity extends BaseStatusActivity<CommonPresenter> i
}
showSelected(multiList);
}
// switch (view.getId()) {
// case R.id.rl_brand:
// setMenuSelect(0, view, attributeListBean.getData().getCata().get(0).getChildren(), tvBrand.getText().toString().trim());
// break;
// case R.id.rl_price:
// setMenuSelect(1, view, attributeListBean.getData().getCata().get(1).getChildren(), tvPrice.getText().toString().trim());
// break;
// case R.id.rl_seat:
// setMenuSelect(2, view, attributeListBean.getData().getCata().get(2).getChildren(), tvSeat.getText().toString().trim());
// break;
// case R.id.rl_selected:
// setMenuSelect(3, view, null, null);
// List<MultiItemBean> multiList = new ArrayList<>();
// for (CarAttributeListBean.DataBean.CataBean bean : attributeListBean.getData().getCata()) {
// multiList.add(bean);
// for (CarAttributeListBean.DataBean.CataBean.ChildrenBean childrenBean : bean.getChildren()) {
// if (listScreeningId != null && listScreeningId.size() > 0) {
// childrenBean.isSelect = listScreeningId.indexOf(childrenBean.getId()) > -1 ? 1 : 0;
// }
// multiList.add(childrenBean);
// }
// }
// showSelected(multiList);
// break;
// }
}
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/ConfirmOrderActivity.java
View file @ 2ff9794d
......@@ -18,21 +18,27 @@ import android.widget.PopupWindow;
import android.widget.RatingBar;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.base.utils.ui.datetime.selector.util.TextUtil;
import com.frame.base.bus.PaymentFailedEvent;
import com.frame.base.bus.PaymentSuccessfulEvent;
import com.frame.base.bus.RxBus;
import com.frame.rv.config.RvFrameConfig;
import com.google.gson.Gson;
import com.ruiwenliu.wrapper.SPConstance;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.util.UtilsManager;
import com.ruiwenliu.wrapper.util.ViewHolder;
import com.ruiwenliu.wrapper.util.glide.GlideManager;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.frame.base.bus.PaymentFailedEvent;
import com.frame.base.bus.PaymentSuccessfulEvent;
import com.frame.base.bus.RxBus;
import com.rv.component.control.SwitchButton;
import com.rv.component.dialog.PaymentTypeSelection;
import com.rv.home.R;
import com.rv.home.R2;
import com.rv.home.rv.module.ApiConfig;
import com.rv.home.rv.module.basic.BaseStatusActivity;
import com.rv.home.rv.module.basic.WebActivity;
import com.rv.home.rv.module.basic.bean.BeanUserInfo;
import com.rv.home.rv.module.basic.presenter.CommonPresenter;
import com.rv.home.rv.module.ui.main.home.bean.CarTypeListBean;
import com.rv.home.rv.module.ui.main.home.bean.ConfirmOrderBean;
......@@ -52,6 +58,7 @@ import java.util.LinkedHashMap;
import java.util.Map;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import io.reactivex.functions.Consumer;
import io.reactivex.schedulers.Schedulers;
......@@ -72,16 +79,6 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
RatingBar ratingBar;
@BindView(R2.id.tv_price)
TextView tvPrice;
@BindView(R2.id.tv_get_time)
TextView tvGetTime;
@BindView(R2.id.tv_get_week)
TextView tvGetWeek;
@BindView(R2.id.tv_day)
TextView tvDay;
@BindView(R2.id.tv_out_time)
TextView tvOutTime;
@BindView(R2.id.tv_out_week)
TextView tvOutWeek;
@BindView(R2.id.tv_get_car_address)
TextView tvGetCarAddress;
@BindView(R2.id.tv_out_car_address)
......@@ -94,16 +91,10 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
LinearLayout llAddDriving;
@BindView(R2.id.tv_deposit)
TextView tvDeposit;
@BindView(R2.id.tv_give_car_info)
TextView tvGiveCarInfo;
@BindView(R2.id.tv_give_car_content)
TextView tvGiveCarContent;
@BindView(R2.id.tv_car_not_hurt)
TextView tvCarNotHurt;
@BindView(R2.id.tv_car_not_hurt_money)
TextView tvCarNotHurtMoney;
@BindView(R2.id.tv_car_not_hurt_content)
TextView tvCarNotHurtContent;
@BindView(R2.id.tv_passenger_know)
CheckBox tvPassengerKnow;
@BindView(R2.id.tv_contract_agreement)
......@@ -120,18 +111,43 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
TextView tvIdCard;
@BindView(R2.id.ll_bottom)
LinearLayout llBottom;
@BindView(R2.id.tv_layout_service_fee)
TextView tvLayoutServiceFee;
@BindView(R2.id.ll_layout_clean_fee)
LinearLayout llLayoutCleanFee;
@BindView(R2.id.swbtn_member)
SwitchButton swbtnMember;
@BindView(R2.id.tv_event_date)
TextView tvEventDate;
@BindView(R2.id.tv_activity_day)
TextView tvActivityDay;
@BindView(R2.id.tv_lab3)
CheckBox tvLab3;
@BindView(R2.id.tv_layout_member_hint)
TextView tvLayoutMemberHint;
@BindView(R2.id.ll_layout_member_hint)
LinearLayout llLayoutMemberHint;
@BindView(R2.id.tv_free_car_days)
TextView tvFreeCarDays;
@BindView(R2.id.tv_xin_driving_price)
TextView tvXinDrivingPrice;
private final int TYPE_REQUEST_DRIVING = 3;
private boolean serviceFeeShow = true;
private boolean cleanFeeShow = true;
private OrderDataBean dataBean;
private CarTypeListBean.DataBeanX.DataBean mCarBean;
private DrivingListBean.DataBeanX.DataBean drivingListBean;
private int drivingType;//驾驶证类型1、欣新驾驶员2、自驾
private int drivingType ;//驾驶证类型1、欣新驾驶员2、自驾
private OrderPriceDetailPw detailPw;//显示订单价格明细弹窗
private OrderPriceDetailBean orderPriceDetailBean;//订单价格明细实体类
private IWXAPI api;
private int payType;//选择支付类型
private OrderPriceBean priceBean;
BeanUserInfo.UserInfo info = null;
private int deductiblePriceType;
public static Intent getIntent(Context context, OrderDataBean bean, CarTypeListBean.DataBeanX.DataBean carBean, String startTime, String endTime) {
return new Intent(context, ConfirmOrderActivity.class)
......@@ -154,6 +170,7 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
mCarBean = (CarTypeListBean.DataBeanX.DataBean) intent.getSerializableExtra("carBean");
intiView();
initRxBus();
}
@SuppressLint("CheckResult")
......@@ -191,9 +208,11 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
switch (requestType) {
case 0:
priceBean = (OrderPriceBean) result;
tvPayMoney.setText(String.format("¥%1$s", priceBean.getData().getOrderAmount()));
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();
break;
case 1:
ConfirmOrderBean orderBean = (ConfirmOrderBean) result;
......@@ -231,23 +250,16 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
}
@OnClick({R2.id.rl_goods, R2.id.tv_get_time, R2.id.tv_get_week, R2.id.tv_out_time, R2.id.tv_out_week, R2.id.tv_get_car_address, R2.id.tv_out_car_address, R2.id.iv_add_driving, R2.id.tv_give_car_info,
R2.id.tv_give_car_content, R2.id.tv_detail, R2.id.tv_confirm_order, R2.id.tv_delete, R2.id.rb_xin_driving, R2.id.rb_user_driving,R2.id.tv_contract_agreement})
@OnClick({R2.id.rl_goods, R2.id.tv_get_car_address, R2.id.tv_out_car_address, R2.id.iv_add_driving,
R2.id.tv_detail, R2.id.tv_confirm_order, R2.id.tv_delete, R2.id.rb_xin_driving,
R2.id.rb_user_driving, R2.id.tv_contract_agreement, R2.id.tv_service_fee_show, R2.id.tv_vehicle_cleaning_fee_show, R2.id.tv_lab3})
public void onViewClicked(View view) {
int i = view.getId();
if (i == R.id.rl_goods) {
} else if (i == R.id.tv_get_time) {
} else if (i == R.id.tv_get_week) {
} else if (i == R.id.tv_out_time) {
} else if (i == R.id.tv_out_week) {
} else if (i == R.id.tv_get_car_address) {
} else if (i == R.id.tv_out_car_address) {
} else if (i == R.id.iv_add_driving) {
startActivityForResult(DrivingListActivity.getIntent(mActivity,drivingListBean), TYPE_REQUEST_DRIVING);
} else if (i == R.id.tv_give_car_info) {
} else if (i == R.id.tv_give_car_content) {
startActivityForResult(DrivingListActivity.getIntent(mActivity, drivingListBean), TYPE_REQUEST_DRIVING);
} else if (i == R.id.tv_detail) {
showOrderDetail(llBottom);
......@@ -263,8 +275,7 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
rbUserDriving.setChecked(false);
llAddDriving.setVisibility(View.GONE);
rbXinDriving.setChecked(true);
getOrderPrice();
getPayMoney();
} else if (i == R.id.rb_user_driving) {
drivingType = 2;
rbXinDriving.setChecked(false);
......@@ -272,26 +283,33 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
if (drivingListBean != null) {
llAddDriving.setVisibility(View.VISIBLE);
}
getOrderPrice();
}else if (i == R.id.tv_contract_agreement){
getPayMoney();
} else if (i == R.id.tv_contract_agreement) {
startActivity(WebActivity.getIntent(mActivity, mActivity.getString(R.string.rv_contract_agreement), ApiConfig.HTTP_URL_CAR_TYPE_NOTICE));
} else if (i == R.id.tv_service_fee_show) {
if (serviceFeeShow) {
tvLayoutServiceFee.setVisibility(View.VISIBLE);
} else {
tvLayoutServiceFee.setVisibility(View.GONE);
}
serviceFeeShow = !serviceFeeShow;
} else if (i == R.id.tv_vehicle_cleaning_fee_show) {
if (cleanFeeShow) {
llLayoutCleanFee.setVisibility(View.VISIBLE);
} else {
llLayoutCleanFee.setVisibility(View.GONE);
}
cleanFeeShow = !cleanFeeShow;
} else if (i == R.id.tv_lab3) {
if (tvLab3.isChecked()) {
deductiblePriceType = 1;
dataBean.setDamageSafe(1);
} else {
dataBean.setDamageSafe(0);
deductiblePriceType = 0;
}
getPayMoney();
}
// if(view.getId()==R.id.iv_add_driving){
// startActivityForResult(DrivingListActivity.getIntent(mActivity), TYPE_REQUEST_DRIVING);
// }else if(view.getId()==R.id.tv_detail){
// showOrderDetail(llBottom);
// }else if(view.getId()==R.id.tv_confirm_order){
// confirmOrder();
// }else if(view.getId()==R.id.tv_delete){
// drivingListBean = null;
// llAddDriving.setVisibility(View.GONE);
// }else if(view.getId()==R.id.iv_add_driving){
//
// }else if(view.getId()==R.id.iv_add_driving){
//
// }
}
/**
......@@ -317,10 +335,10 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
@Override
public void onClick(View v) {
int i = v.getId();
if (i ==R.id.iv_close){
if (i == R.id.iv_close) {
dismiss();
createOrder(3);
}else if (i == R.id.ll_item_wechat) {
} else if (i == R.id.ll_item_wechat) {
payType = 1;
helper.setChecked(R.id.rb_wechat, true);
helper.setChecked(R.id.rb_alipay, false);
......@@ -337,7 +355,7 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
}
}
},R.id.iv_close, R.id.ll_item_wechat, R.id.ll_item_alipay, R.id.tv_pay_immediately);
}, R.id.iv_close, R.id.ll_item_wechat, R.id.ll_item_alipay, R.id.tv_pay_immediately);
}
}.show();
}
......@@ -349,7 +367,7 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
Map<String, Object> headMap = new LinkedHashMap<>();
if (OkGoUtil.getToken() != null)
headMap.put("Authorization", OkGoUtil.getToken());
Log.i("confirmorderactivity", "createOrder: " +dataBean.toString());
Log.i("confirmorderactivity", "createOrder: " + dataBean.toString());
mPresenter.postBodyData(RvFrameConfig.VEHICLE_ORDER, payType, ApiConfig.HTTP_URL_CONFIRM_ORDER, ConfirmOrderBean.class, dataBean, headMap, true);
}
......@@ -358,7 +376,7 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
*/
private void getOrderPrice() {
Map<String, Object> map = new LinkedHashMap<>();
map.put("driverType", drivingType);
map.put("driverType", 1);
map.put("modelId", dataBean.getModelId());
map.put("startTime", dataBean.getStartTime());
map.put("endTime", dataBean.getEndTime());
......@@ -373,10 +391,6 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
Map<String, Object> headMap = new LinkedHashMap<>();
if (OkGoUtil.getToken() != null)
headMap.put("Authorization", OkGoUtil.getToken());
// Map<String, Object> map = new LinkedHashMap<>();
// map.put("orderNo",orderNo);
// map.put("payWay",payWay);
// map.put("type",type);
mPresenter.postBodyData(RvFrameConfig.VEHICLE_ORDER, 2, ApiConfig.HTTP_URL_PAY_THE_CALLBACK, OrderPayBean.class, new payBody(orderNo, payWay, type), headMap, true);
}
......@@ -385,20 +399,60 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
* 初始化View
*/
private void intiView() {
drivingType = dataBean.getDriverType();
rbXinDriving.setChecked(drivingType == 1 ? true : false);
GlideManager.getInstance(mActivity).loadImage(mCarBean.getVehicleModel().getPicture(), ivGoods);
GlideManager.getInstance(mActivity).loadImage(mCarBean.getVehicleModel().getIcon(), ivGoods);
tvName.setText(mCarBean.getVehicleModel().getName());
tvContent.setText(mCarBean.getVehicleModel().getKeyword());
ratingBar.setRating((float) mCarBean.getVehicleModel().getPoint());
tvDay.setText(String.format("%1$s%2$s", dataBean.getDayNum(), mActivity.getString(R.string.rv_days)));
tvPrice.setText(String.format("%1$s%2$s", mCarBean.getVehicleModel().getPrice(), mActivity.getString(R.string.rv_day)));
tvGetTime.setText(getIntent().getStringExtra("startTime"));
tvOutTime.setText(getIntent().getStringExtra("endTime"));
tvPrice.setText(String.format("%1$s%2$s", mCarBean.getVehicleModel().getSum(), mActivity.getString(R.string.rv_day)));
tvEventDate.setText(getIntent().getStringExtra("startTime") + "~" + getIntent().getStringExtra("endTime"));
tvActivityDay.setText(String.format("%1$s%2$s", dataBean.getDayNum(), mActivity.getString(R.string.rv_days)));
tvGetCarAddress.setText(dataBean.getStartAddr());
tvOutCarAddress.setText(dataBean.getEndAddr());
String spStringCode = UtilsManager.getInstance(OkGoUtil.application).getSPStringCode(SPConstance.USER_JSON, SPConstance.USER_JSON_USERINFO);
if (!TextUtil.isEmpty(spStringCode)) {
info = JSON.parseObject(spStringCode, BeanUserInfo.UserInfo.class);
}
if (info != null) {
if (0 == info.getIsMember()) {
tvLayoutMemberHint.setVisibility(View.GONE);
llLayoutMemberHint.setVisibility(View.GONE);
} else if (1 == info.getIsMember()) {
tvLayoutMemberHint.setVisibility(View.VISIBLE);
llLayoutMemberHint.setVisibility(View.VISIBLE);
tvFreeCarDays.setText("（剩余" + info.getRentFreeDays() + "天）");
}
}
swbtnMember.setOnCheckedChangeListener(new SwitchButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(SwitchButton view, boolean isChecked) {
if (isChecked) {
dataBean.setRentFreeDay(1);
} else {
dataBean.setRentFreeDay(0);
}
}
});
}
/**
* 支付价格计算
*/
private void getPayMoney() {
double payMoney = 0.00;
double dayPrice = mCarBean.getVehicleModel().getSum();
int dayNum = dataBean.getDayNum();
payMoney = dayPrice * dayNum + priceBean.getData().getDeposit(); //租车和押金价格
if (drivingType == 1) {
payMoney = payMoney + priceBean.getData().getDriverAmount(); // + 专职司机
}
if (deductiblePriceType ==1){
payMoney = payMoney +priceBean.getData().getDamageSafePrice() * dayNum; //+免赔付价格
}
tvPayMoney.setText(String.format("¥%1$s", payMoney));
}
private String getContent(String name, String card) {
return String.format("%1$s <font color='#666666'>%2$s</font>", name, card);
......@@ -486,6 +540,13 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// TODO: add setContentView(...) invocation
ButterKnife.bind(this);
}
public class payBody {
private String orderNo;
private int payWay;
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/HomeFragment.java
View file @ 2ff9794d
......@@ -31,6 +31,12 @@ import com.alibaba.android.arouter.launcher.ARouter;
import com.baidu.location.BDAbstractLocationListener;
import com.baidu.location.BDLocation;
import com.baidu.mapapi.model.LatLng;
import com.baidu.mapapi.search.core.SearchResult;
import com.baidu.mapapi.search.geocode.GeoCodeOption;
import com.baidu.mapapi.search.geocode.GeoCodeResult;
import com.baidu.mapapi.search.geocode.GeoCoder;
import com.baidu.mapapi.search.geocode.OnGetGeoCoderResultListener;
import com.baidu.mapapi.search.geocode.ReverseGeoCodeResult;
import com.base.utils.ui.datetime.selector.util.TextUtil;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.frame.base.url.Constance;
......@@ -48,6 +54,7 @@ import com.rv.component.utils.ObservableScrollView;
import com.rv.home.R;
import com.rv.home.R2;
import com.rv.home.rv.module.ApiConfig;
import com.rv.home.rv.module.basic.WebActivity;
import com.rv.home.rv.module.basic.presenter.CommonPresenter;
import com.rv.home.rv.module.ui.main.home.adapter.HotCarTypeAdapter;
import com.rv.home.rv.module.ui.main.home.adapter.RVEnthusiastAdapter;
......@@ -193,6 +200,7 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
private Map<String, Integer> mapGetTime;
private Map<String, Integer> mapOutTime;
private LocationManager locationManager;
private GeoCoder geoCoder;
private List<HomePopularBrigade.DataBean> hotData; //热门标签
private double rvTourLatitude = 0;
......@@ -430,9 +438,15 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
mRvTourAdapter.setNewData(hotData);
mRvTourLabelAdapter.setNewData(hotData);
}
@OnClick({R2.id.travel_city_layout, R2.id.ll_item_search,R2.id.tv_item_rv_tour, R2.id.tv_item_renting_a_car, R2.id.tv_get_city, R2.id.tv_out_city, R2.id.tv_get_address, R2.id.tv_out_address, R2.id.ll_item_get_time, R2.id.ll_item_alsotime, R2.id.tv_select_car, R2.id.ll_item_rv_city, R2.id.tv_book_now, R2.id.ll_item_rv_hot_label1, R2.id.ll_item_rv_hot_label2, R2.id.ll_item_rv_hot_label3, R2.id.ll_item_hot_rvtour, R2.id.ll_item_hot_entertainment_camp, R2.id.ll_item_hot_car_rental, R2.id.tv_see_more_popular, R2.id.ll_item_top})
@OnClick({R2.id.travel_city_layout, R2.id.ll_item_search,R2.id.tv_item_rv_tour, R2.id.tv_item_renting_a_car, R2.id.tv_get_city,
R2.id.tv_out_city, R2.id.tv_get_address, R2.id.tv_out_address, R2.id.ll_item_get_time, R2.id.ll_item_alsotime, R2.id.tv_select_car,
R2.id.ll_item_rv_city, R2.id.tv_book_now, R2.id.ll_item_rv_hot_label1, R2.id.ll_item_rv_hot_label2, R2.id.ll_item_rv_hot_label3,
R2.id.ll_item_hot_rvtour, R2.id.ll_item_hot_entertainment_camp, R2.id.ll_item_hot_car_rental, R2.id.tv_see_more_popular,
R2.id.ll_item_top, R2.id.tv_car_rental_guide})
public void onViewClicked(View view) {
int id = view.getId();
if (id == R.id.travel_city_layout) {
......@@ -638,6 +652,9 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
scrollview.fullScroll(View.FOCUS_UP);
}else if (id == R.id.travel_server_image){
showToast("亲，该功能还在开发中。。。");
}else if (id == R.id.tv_car_rental_guide){
//租车指南
startActivity(WebActivity.getIntent(_mActivity, _mActivity.getString(R.string.rv_contract_agreement), ApiConfig.HTTP_URL_CAR_TYPE_NOTICE));
}
}
......@@ -710,9 +727,11 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
tvRvCity.setText(data);
break;
case 4:
travelCityLatitude = lat;
travelCityLongitude = lon;
travelCityText.setText(data);
geoCoder.geocode(new GeoCodeOption()
.city(data)
.address(data));
break;
}
}
......@@ -1008,6 +1027,7 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
public void accept(Boolean aBoolean) throws Exception {
if (aBoolean == true) {
initGps();
initCity();
} else {
getActivity().finish();
}
......@@ -1015,7 +1035,34 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
});
} else {
initGps();
initCity();
}
}
private void initCity() {
geoCoder = GeoCoder.newInstance();
geoCoder.setOnGetGeoCodeResultListener(new OnGetGeoCoderResultListener() {
@Override
public void onGetGeoCodeResult(GeoCodeResult result) {
if (result == null || result.error != SearchResult.ERRORNO.NO_ERROR) {
//没有检索到结果
} else {
latLatitude = result.getLocation().latitude;
lonLongitude = result.getLocation().longitude;
}
//获取地理编码结果
}
@Override
public void onGetReverseGeoCodeResult(ReverseGeoCodeResult result) {
if (result == null || result.error != SearchResult.ERRORNO.NO_ERROR) {
//没有找到检索结果
}else {
latLatitude = result.getLocation().latitude;
lonLongitude = result.getLocation().longitude;
}
}
});
}
/**
......@@ -1054,4 +1101,10 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
}
});
}
@Override
public void onDestroy() {
super.onDestroy();
geoCoder.destroy();
}
}
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/ShareImageActivity.java
View file @ 2ff9794d
......@@ -66,7 +66,7 @@ public class ShareImageActivity extends SwipeBackActivity<CommonPresenter> {
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
showTitle(false);
mCarBean = (CarTypeListBean.DataBeanX.DataBean) getIntent().getSerializableExtra("carBean");
GlideManager.getInstance(this).loadImage(mCarBean.getVehicleModel().getPicture(), ivGoods);
GlideManager.getInstance(this).loadImage(mCarBean.getVehicleModel().getIcon(), ivGoods);
tvName.setText(mCarBean.getVehicleModel().getName());
tvContent.setText(mCarBean.getVehicleModel().getKeyword());
tvPrice.setText(String.format("%1$s%2$s", mCarBean.getVehicleModel().getPrice(), this.getString(R.string.rv_day)));
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/adapter/CarRentalListAdapter.java
View file @ 2ff9794d
......@@ -27,7 +27,7 @@ public class CarRentalListAdapter extends BaseQuickAdapter<CarTypeListBean.DataB
helper.setText(R.id.tv_name,item.getVehicleModel().getName());
helper.setText(R.id.tv_context,item.getVehicleModel().getKeyword());
helper.setText(R.id.tv_point,String.valueOf(item.getVehicleModel().getPoint()));
helper.loadImage(mContext,item.getVehicleModel().getPicture(), (ImageView) helper.getView(R.id.iv_goods));
helper.loadImage(mContext,item.getVehicleModel().getIcon(), (ImageView) helper.getView(R.id.iv_goods));
// helper.setText(R.id.tv_name,item);
helper.setText(R.id.tv_price,String.format("¥%1$s%2$s",item.getVehicleModel().getPrice(),mContext.getString(R.string.rv_day)));
}
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/bean/CarTypeListBean.java
View file @ 2ff9794d
package com.rv.home.rv.module.ui.main.home.bean;
import com.alibaba.fastjson.JSON;
import com.base.utils.ui.datetime.selector.util.TextUtil;
import com.google.gson.Gson;
import com.google.gson.annotations.SerializedName;
import com.google.gson.reflect.TypeToken;
import com.ruiwenliu.wrapper.SPConstance;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.util.UtilsManager;
import com.rv.home.rv.module.basic.bean.BeanUserInfo;
import com.yuyife.okgo.OkGoUtil;
import org.w3c.dom.Text;
import java.io.Serializable;
import java.util.List;
......@@ -12,7 +22,7 @@ import java.util.List;
* Desc:租车类型列表
*/
public class CarTypeListBean extends BaseBean implements Serializable{
public class CarTypeListBean extends BaseBean implements Serializable {
/**
......@@ -39,7 +49,7 @@ public class CarTypeListBean extends BaseBean implements Serializable{
this.rel = rel;
}
public static class DataBeanX implements Serializable{
public static class DataBeanX implements Serializable {
/**
* totalCount : 32
* totalPage : 4
......@@ -94,7 +104,7 @@ public class CarTypeListBean extends BaseBean implements Serializable{
this.data = data;
}
public static class DataBean implements Serializable{
public static class DataBean implements Serializable {
/**
* distance : 4307.442767774642
* vehicleModel : {"id":25,"name":"大通自行式C型房车（旅居版）车型24","licensePlate":"C24","factory":1,"keyword":"烧烤,6乘29卧,麻将,微波炉","point":0,"picture":"https://xxfcim.upyuns.com/image/u/2/10000002/201905/o/adb766b69c0140018a3aaaa08b37d41d.jpg"}
......@@ -129,7 +139,7 @@ public class CarTypeListBean extends BaseBean implements Serializable{
this.company = company;
}
public static class VehicleModelBean implements Serializable{
public static class VehicleModelBean implements Serializable {
/**
* id : 25
* name : 大通自行式C型房车（旅居版）车型24
......@@ -148,6 +158,48 @@ public class CarTypeListBean extends BaseBean implements Serializable{
private double point;
private String picture;
private double price;
private String rentDiscountPrice;//租车优惠价格
private int rentDiscountStatus;//租车优惠状态 0–没有优惠;1–会员折扣;2–固定值
public double getSum() {
BeanUserInfo.UserInfo info = null;
String spStringCode = UtilsManager.getInstance(OkGoUtil.application).getSPStringCode(SPConstance.USER_JSON, SPConstance.USER_JSON_USERINFO);
if (!TextUtil.isEmpty(spStringCode)) {
info = JSON.parseObject(spStringCode, BeanUserInfo.UserInfo.class);
}
double amount = price;
if (info == null) {
return price;
}
if (0 == info.getIsMember()) { //不是会员
amount = price;
} else if (1 == info.getIsMember()) { //会员
if (0 == rentDiscountStatus) {
amount = price;
} else if (1 == rentDiscountStatus) {
int discount = info.getDiscount();
amount = price * (discount / 100);
} else if (2 == rentDiscountStatus) {
if (!TextUtil.isEmpty(rentDiscountPrice)){
String[] list = rentDiscountPrice.split(",");
int memberLevel = info.getMemberLevel();//1 普通会员 2 黄金会员 3 钻石会员
if (list !=null && list.length >1){
if (1==memberLevel){
amount = Integer.valueOf(list[0]);
}else if (2==memberLevel){
amount = Integer.valueOf(list[1]);
}else if (3==memberLevel){
amount = Integer.valueOf(list[2]);
}
}
}
}
}
return amount;
}
public double getPrice() {
return price;
......@@ -212,9 +264,39 @@ public class CarTypeListBean extends BaseBean implements Serializable{
public void setPicture(String picture) {
this.picture = picture;
}
public String getIcon() {
String icon = "";
if (!TextUtil.isEmpty(picture)) {
String[] icons = picture.split(",");
if (icons != null && icons.length > 0) {
icon = icons[0];
} else {
icon = picture;
}
}
return icon;
}
public String getRentDiscountPrice() {
return rentDiscountPrice;
}
public void setRentDiscountPrice(String rentDiscountPrice) {
this.rentDiscountPrice = rentDiscountPrice;
}
public int getRentDiscountStatus() {
return rentDiscountStatus;
}
public void setRentDiscountStatus(int rentDiscountStatus) {
this.rentDiscountStatus = rentDiscountStatus;
}
}
public static class CompanyBean implements Serializable{
public static class CompanyBean implements Serializable {
/**
* id : 2
* name : 深圳宝安分公司
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/bean/OrderDataBean.java
View file @ 2ff9794d
......@@ -48,6 +48,9 @@ public class OrderDataBean implements Serializable{
private int startCompanyId;
private long startTime;
// private int vehicleId;
private int damageSafe;//是否购买免赔 1--是 0--否
private int rentFreeDay;//是否使用出租免费天数 1--是 0--否
private String couponIds;//优惠券ids，逗号分割
public int getDayNum() {
return dayNum;
......@@ -163,6 +166,29 @@ public class OrderDataBean implements Serializable{
this.startTime = startTime;
}
public int getDamageSafe() {
return damageSafe;
}
public void setDamageSafe(int damageSafe) {
this.damageSafe = damageSafe;
}
public int getRentFreeDay() {
return rentFreeDay;
}
public void setRentFreeDay(int rentFreeDay) {
this.rentFreeDay = rentFreeDay;
}
public String getCouponIds() {
return couponIds;
}
public void setCouponIds(String couponIds) {
this.couponIds = couponIds;
}
@Override
public String toString() {
......@@ -181,6 +207,9 @@ public class OrderDataBean implements Serializable{
", startCityName='" + startCityName + '\'' +
", startCompanyId=" + startCompanyId +
", startTime=" + startTime +
", damageSafe=" + damageSafe +
", rentFreeDay=" + rentFreeDay +
", couponIds='" + couponIds + '\'' +
'}';
}
}
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/bean/OrderPriceBean.java
View file @ 2ff9794d
......@@ -46,9 +46,12 @@ public class OrderPriceBean extends BaseBean{
private double orderAmount;
private double goodsAmount;
private double vehicleAmount;
private int driverAmount;
private int deposit;
private int driverAmount; //司机价格
private double driverPrice; //司机单价
private int deposit; // 押金价格
private String costDetail;
private double damageSafePrice;//免赔付单价
private double damageSafeAmount;//免赔付价格
public String getCostDetail() {
return costDetail;
......@@ -97,5 +100,29 @@ public class OrderPriceBean extends BaseBean{
public void setDeposit(int deposit) {
this.deposit = deposit;
}
public double getDriverPrice() {
return driverPrice;
}
public void setDriverPrice(double driverPrice) {
this.driverPrice = driverPrice;
}
public double getDamageSafePrice() {
return damageSafePrice;
}
public void setDamageSafePrice(double damageSafePrice) {
this.damageSafePrice = damageSafePrice;
}
public double getDamageSafeAmount() {
return damageSafeAmount;
}
public void setDamageSafeAmount(double damageSafeAmount) {
this.damageSafeAmount = damageSafeAmount;
}
}
}
module_home/src/main/res/layout/fragment_home.xml
View file @ 2ff9794d
......@@ -343,6 +343,7 @@
android:textSize="@dimen/text_16" />
<TextView
android:id="@+id/tv_car_rental_guide"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_20"
......
module_home/src/main/res/layout/rv_act_confim_order.xml
View file @ 2ff9794d
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
......@@ -23,7 +24,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_15"
android:background="@color/colorWrite"
android:padding="@dimen/size_15">
<ImageView
......@@ -87,102 +87,42 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_15"
android:background="@color/colorWrite"
android:orientation="horizontal"
android:paddingBottom="@dimen/size_15"
android:paddingLeft="@dimen/size_15"
android:paddingRight="@dimen/size_15">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_20"
android:background="@drawable/shape_rv_bg_yellow"
android:paddingBottom="@dimen/size_3"
android:paddingLeft="@dimen/size_5"
android:paddingRight="@dimen/size_5"
android:paddingTop="@dimen/size_3"
android:text="@string/rv_get"
android:textColor="@color/colorWrite"
android:textSize="@dimen/text_10" />
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
android:orientation="vertical">
<TextView
android:id="@+id/tv_get_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_5"
android:layout_marginTop="@dimen/size_20"
android:text="2019-22"
android:textColor="@color/textGray"
android:textSize="@dimen/text_12" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/size_50"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginRight="@dimen/size_15"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_get_week"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/tv_get_time"
android:layout_marginLeft="@dimen/size_5"
android:text=""
android:text="活动日期："
android:textColor="@color/textGray"
android:textSize="@dimen/text_16"
android:visibility="gone" />
</RelativeLayout>
<TextView
android:id="@+id/tv_day"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_10"
android:layout_weight="1"
android:drawableBottom="@color/colorLine"
android:gravity="center"
android:text="3天"
android:textSize="@dimen/text_14" />
<TextView
android:layout_width="wrap_content"
android:id="@+id/tv_event_date"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_20"
android:background="@drawable/shape_rv_main"
android:paddingBottom="@dimen/size_3"
android:paddingLeft="@dimen/size_5"
android:paddingRight="@dimen/size_5"
android:paddingTop="@dimen/size_3"
android:text="@string/rv_out"
android:textColor="@color/colorWrite"
android:textSize="@dimen/text_10" />
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_out_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_5"
android:layout_marginTop="@dimen/size_20"
android:text="2019-22"
android:textColor="@color/textGray"
android:layout_weight="1"
android:text="2019-06-12 10:00~2019-06-15 18:00"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_12" />
<TextView
android:id="@+id/tv_out_week"
android:id="@+id/tv_activity_day"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/tv_out_time"
android:layout_marginLeft="@dimen/size_5"
android:text=""
android:textColor="@color/textGray"
android:textSize="@dimen/text_16"
android:visibility="gone" />
</RelativeLayout>
android:background="@drawable/shape_rv_bg_shallow_yellow_small_circle"
android:padding="@dimen/size_5"
android:text="3天"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_12" />
</LinearLayout>
......@@ -246,7 +186,7 @@
android:textSize="@dimen/text_16" />
</LinearLayout>
</LinearLayout>
<!--<LinearLayout-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="wrap_content"-->
......@@ -324,36 +264,50 @@
android:layout_marginTop="@dimen/size_15"
android:background="@color/colorWrite"
android:orientation="vertical"
android:paddingBottom="@dimen/size_15"
android:paddingTop="@dimen/size_15"
>
android:paddingBottom="@dimen/size_15">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_weight="1"
android:paddingBottom="@dimen/size_15"
android:paddingLeft="@dimen/size_15"
android:paddingBottom="@dimen/size_15"
android:text="@string/rv_driving_set"
android:textColor="@color/textMain"
android:textSize="@dimen/text_16" />
<include layout="@layout/common_line" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<CheckBox
android:id="@+id/rb_xin_driving"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/size_15"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginRight="@dimen/size_15"
android:layout_marginTop="@dimen/size_15"
android:paddingLeft="@dimen/size_10"
android:layout_marginBottom="@dimen/size_15"
android:button="@drawable/selector_rv_check"
android:paddingLeft="@dimen/size_10"
android:text="@string/rv_select_driving_num_hint"
android:textSize="@dimen/text_14" />
<TextView
android:id="@+id/tv_xin_driving_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/text_14"
android:textColor="@color/colorBg"
android:text="（￥600/天）"/>
</LinearLayout>
<include layout="@layout/common_line" />
<LinearLayout
......@@ -369,8 +323,8 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginRight="@dimen/size_8"
android:paddingLeft="@dimen/size_10"
android:button="@drawable/selector_rv_check"
android:paddingLeft="@dimen/size_10"
android:text="@string/rv_user_driving"
android:textSize="@dimen/text_14" />
......@@ -389,106 +343,11 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/size_15"
android:padding="@dimen/size_3"
android:src="@drawable/rv_common_icon_thestaff" />
</LinearLayout>
</LinearLayout>
<!--<LinearLayout-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="wrap_content"-->
<!--android:layout_marginTop="@dimen/size_15"-->
<!--android:background="@color/colorWrite"-->
<!--android:gravity="center_vertical"-->
<!--android:orientation="horizontal"-->
<!--android:padding="@dimen/size_15">-->
<!--<TextView-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="wrap_content"-->
<!--android:layout_weight="1"-->
<!--android:text="@string/rv_select_driving_num_hint"-->
<!--android:textColor="@color/textMain"-->
<!--android:textSize="@dimen/text_16" />-->
<!--&lt;!&ndash;<LinearLayout&ndash;&gt;-->
<!--&lt;!&ndash;android:layout_width="wrap_content"&ndash;&gt;-->
<!--&lt;!&ndash;android:layout_height="@dimen/size_40"&ndash;&gt;-->
<!--&lt;!&ndash;android:background="@drawable/shape_rv_border_gray"&ndash;&gt;-->
<!--&lt;!&ndash;android:orientation="horizontal">&ndash;&gt;-->
<!--&lt;!&ndash;<TextView&ndash;&gt;-->
<!--&lt;!&ndash;android:id="@+id/tv_cut_driving"&ndash;&gt;-->
<!--&lt;!&ndash;android:layout_width="@dimen/size_40"&ndash;&gt;-->
<!--&lt;!&ndash;android:layout_height="match_parent"&ndash;&gt;-->
<!--&lt;!&ndash;android:gravity="center"&ndash;&gt;-->
<!--&lt;!&ndash;android:text="-"&ndash;&gt;-->
<!--&lt;!&ndash;android:textColor="@color/textGray"&ndash;&gt;-->
<!--&lt;!&ndash;android:textSize="@dimen/text_30" />&ndash;&gt;-->
<!--&lt;!&ndash;<View&ndash;&gt;-->
<!--&lt;!&ndash;android:layout_width="@dimen/size_half"&ndash;&gt;-->
<!--&lt;!&ndash;android:layout_height="match_parent"&ndash;&gt;-->
<!--&lt;!&ndash;android:background="@color/colorLine" />&ndash;&gt;-->
<!--&lt;!&ndash;<TextView&ndash;&gt;-->
<!--&lt;!&ndash;android:id="@+id/tv_driving_num"&ndash;&gt;-->
<!--&lt;!&ndash;android:layout_width="@dimen/size_60"&ndash;&gt;-->
<!--&lt;!&ndash;android:layout_height="match_parent"&ndash;&gt;-->
<!--&lt;!&ndash;android:gravity="center"&ndash;&gt;-->
<!--&lt;!&ndash;android:text="123"&ndash;&gt;-->
<!--&lt;!&ndash;android:textColor="@color/textGray"&ndash;&gt;-->
<!--&lt;!&ndash;android:textSize="@dimen/text_16" />&ndash;&gt;-->
<!--&lt;!&ndash;<View&ndash;&gt;-->
<!--&lt;!&ndash;android:layout_width="@dimen/size_half"&ndash;&gt;-->
<!--&lt;!&ndash;android:layout_height="match_parent"&ndash;&gt;-->
<!--&lt;!&ndash;android:background="@color/colorLine" />&ndash;&gt;-->
<!--&lt;!&ndash;<TextView&ndash;&gt;-->
<!--&lt;!&ndash;android:id="@+id/tv_add_driving"&ndash;&gt;-->
<!--&lt;!&ndash;android:layout_width="@dimen/size_40"&ndash;&gt;-->
<!--&lt;!&ndash;android:layout_height="match_parent"&ndash;&gt;-->
<!--&lt;!&ndash;android:gravity="center"&ndash;&gt;-->
<!--&lt;!&ndash;android:text="+"&ndash;&gt;-->
<!--&lt;!&ndash;android:textColor="@color/textGray"&ndash;&gt;-->
<!--&lt;!&ndash;android:textSize="@dimen/text_20" />&ndash;&gt;-->
<!--&lt;!&ndash;</LinearLayout>&ndash;&gt;-->
<!--<TextView-->
<!--android:id="@+id/tv_driving_num"-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="match_parent"-->
<!--android:gravity="center"-->
<!--android:text="1"-->
<!--android:textColor="@color/textGray"-->
<!--android:textSize="@dimen/text_16" />-->
<!--</LinearLayout>-->
<!--<RelativeLayout-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="wrap_content"-->
<!--android:layout_marginTop="@dimen/size_15"-->
<!--android:background="@color/colorWrite"-->
<!--android:padding="@dimen/size_15">-->
<!--<TextView-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="wrap_content"-->
<!--android:layout_centerVertical="true"-->
<!--android:layout_weight="1"-->
<!--android:text="@string/rv_give_driving"-->
<!--android:textColor="@color/textMain"-->
<!--android:textSize="@dimen/text_16" />-->
<!--<ImageView-->
<!--android:layout_width="@dimen/size_30"-->
<!--android:layout_height="@dimen/size_30"-->
<!--android:id="@+id/iv_add_driving"-->
<!--android:layout_alignParentRight="true"-->
<!--android:layout_centerVertical="true"-->
<!--android:src="@drawable/shape_rv_main" />-->
<!--</RelativeLayout>-->
<include layout="@layout/common_line" />
<LinearLayout
......@@ -497,8 +356,8 @@
android:layout_height="wrap_content"
android:background="@color/colorWrite"
android:orientation="horizontal"
android:visibility="gone"
android:padding="@dimen/size_15">
android:padding="@dimen/size_15"
android:visibility="gone">
<TextView
android:layout_width="wrap_content"
......@@ -545,6 +404,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_15"
android:layout_marginBottom="@dimen/size_15"
android:background="@color/colorWrite"
android:orientation="horizontal"
android:padding="@dimen/size_15">
......@@ -552,10 +412,10 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/rv_deposit"
android:drawableRight="@drawable/rv_common_icon_notice"
android:drawablePadding="@dimen/size_5"
android:text="@string/rv_deposit"
android:textColor="@color/textMain"
android:drawableRight="@drawable/rv_common_icon_notice"
android:textSize="@dimen/text_16" />
......@@ -565,16 +425,22 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_10"
android:gravity="right"
android:text=""
android:text="¥20000元"
android:textColor="@color/colorAuxiliaryRed"
android:textSize="@dimen/text_16" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/colorWrite"
android:layout_marginBottom="@dimen/size_15"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_15"
android:background="@color/colorWrite"
android:padding="@dimen/size_15">
......@@ -587,122 +453,137 @@
android:textColor="@color/textMain"
android:textSize="@dimen/text_16" />
<ImageView
android:layout_width="@dimen/size_16"
android:layout_height="@dimen/size_16"
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:src="@drawable/rv_common_icon_notice" />
android:drawableRight="@drawable/common_icon_rig_gray"
android:drawablePadding="@dimen/size_5"
android:text="详细说明"
android:textColor="@color/text_Gray"
android:textSize="@dimen/text_10" />
</RelativeLayout>
<include layout="@layout/common_line" />
<RelativeLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/colorWrite"
android:orientation="horizontal"
android:padding="@dimen/size_15">
<TextView
android:id="@+id/tv_lab1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/rv_include_rent_car"
android:text="已含租车服务费"
android:textColor="@color/textMain"
android:textSize="@dimen/text_14" />
<TextView
android:id="@+id/tv_give_car_info"
android:layout_width="match_parent"
android:id="@+id/tv_service_fee_show"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_2"
android:layout_toRightOf="@id/tv_lab1"
android:drawableRight="@drawable/common_icon_more_details_up"
android:drawablePadding="@dimen/size_5"
android:paddingLeft="@dimen/size_20"
android:paddingRight="@dimen/size_20"
android:text="@string/rv_detailed_info"
android:textColor="@color/textGray"
android:textSize="@dimen/text_12" />
</LinearLayout>
<TextView
android:id="@+id/tv_give_car_content"
android:layout_width="match_parent"
android:id="@+id/tv_layout_service_fee"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/tv_give_car_info"
android:layout_marginTop="@dimen/size_8"
android:textColor="@color/textLightGrey"
android:textSize="@dimen/text_12"
android:visibility="gone" />
android:layout_marginLeft="@dimen/size_15"
android:textColor="@color/textGray"
android:textSize="@dimen/text_10"
android:visibility="gone"
android:layout_marginBottom="@dimen/size_10"
android:text="租车期间服务费" />
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/size_half"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginRight="@dimen/size_15"
android:background="@color/colorLine"/>
<RelativeLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/colorWrite"
android:paddingLeft="@dimen/size_15"
android:paddingRight="@dimen/size_15">
android:orientation="horizontal"
android:padding="@dimen/size_15">
<include layout="@layout/common_line" />
</RelativeLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="已含车辆清洁费"
android:textColor="@color/textMain"
android:textSize="@dimen/text_14" />
<!--<RelativeLayout-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="wrap_content"-->
<!--android:background="@color/colorWrite"-->
<!--android:padding="@dimen/size_15">-->
<TextView
android:id="@+id/tv_vehicle_cleaning_fee_show"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_2"
android:drawableRight="@drawable/common_icon_more_details_up"
android:drawablePadding="@dimen/size_5"
android:paddingLeft="@dimen/size_20"
android:paddingRight="@dimen/size_20"
android:text="@string/rv_detailed_info"
android:textColor="@color/textGray"
android:textSize="@dimen/text_12" />
</LinearLayout>
<!--<TextView-->
<!--android:id="@+id/tv_lab2"-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:layout_weight="1"-->
<!--android:text="@string/rv_include_rent_car"-->
<!--android:textColor="@color/textMain"-->
<!--android:textSize="@dimen/text_14" />-->
<LinearLayout
android:visibility="gone"
android:id="@+id/ll_layout_clean_fee"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginRight="@dimen/size_15"
android:orientation="vertical">
<!--<TextView-->
<!--android:id="@+id/tv_include_car_clear"-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:layout_marginTop="@dimen/size_2"-->
<!--android:layout_toRightOf="@id/tv_lab2"-->
<!--android:paddingLeft="@dimen/size_20"-->
<!--android:paddingRight="@dimen/size_20"-->
<!--android:text="@string/rv_include_car_clear"-->
<!--android:textColor="@color/textGray"-->
<!--android:textSize="@dimen/text_12" />-->
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/text_10"
android:textColor="@color/colorMain"
android:text="车辆清洁费"/>
<!--<TextView-->
<!--android:id="@+id/tv_car_clear_money"-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:layout_alignParentRight="true"-->
<!--android:layout_weight="1"-->
<!--android:text="￥100"-->
<!--android:textColor="@color/textMain"-->
<!--android:textSize="@dimen/text_14" />-->
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_5"
android:textColor="@color/textGray"
android:textSize="@dimen/text_10"
android:text="1. 已含100元车辆清洁费(含车辆外观、内饰等的清洁费用)， 保证取车时车辆 干净整洁;" />
<!--<TextView-->
<!--android:id="@+id/tv_include_car_content"-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="wrap_content"-->
<!--android:layout_below="@id/tv_car_clear_money"-->
<!--android:layout_marginTop="@dimen/size_8"-->
<!--android:textColor="@color/textLightGrey"-->
<!--android:textSize="@dimen/text_12"-->
<!--android:visibility="gone" />-->
<!--</RelativeLayout>-->
<!--<RelativeLayout-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="wrap_content"-->
<!--android:background="@color/colorWrite"-->
<!--android:paddingLeft="@dimen/size_15"-->
<!--android:paddingRight="@dimen/size_15">-->
<!--<include layout="@layout/common_line" />-->
<!--</RelativeLayout>-->
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_5"
android:textColor="@color/textGray"
android:textSize="@dimen/text_10"
android:layout_marginBottom="@dimen/size_10"
android:text="2. 还车时，因客户原因，出现以下情形的：\n a.黑水箱未清理或移动马桶有污渍;\n b.冰箱未清理或有污渍;\n c.床垫有明显新增污渍，每项加收100元清洁服务费。" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/size_half"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginRight="@dimen/size_15"
android:background="@color/colorLine"/>
<RelativeLayout
android:layout_width="match_parent"
......@@ -715,9 +596,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/rv_car_not_hurt"
android:paddingLeft="@dimen/size_10"
android:button="@drawable/selector_rv_check"
android:paddingLeft="@dimen/size_10"
android:text="@string/rv_car_not_hurt"
android:textColor="@color/textMain"
android:textSize="@dimen/text_14" />
......@@ -740,31 +621,113 @@
android:layout_alignParentRight="true"
android:layout_weight="1"
android:text="￥100/日"
android:textColor="@color/textMain"
android:textColor="@color/colorBg"
android:textSize="@dimen/text_14" />
</RelativeLayout>
<TextView
android:id="@+id/tv_car_not_hurt_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/tv_car_not_hurt_money"
android:layout_marginTop="@dimen/size_8"
android:textColor="@color/textLightGrey"
android:textSize="@dimen/text_12"
android:visibility="gone" />
</RelativeLayout>
android:layout_marginLeft="@dimen/size_15"
android:layout_marginBottom="@dimen/size_10"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_10"
android:text="不计免赔服务 "/>
<RelativeLayout
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/text_10"
android:layout_marginTop="@dimen/size_5"
android:textColor="@color/textGray"
android:text="如在租赁期间内购买购买不计免赔服务，则1500元本车车辆损伤无需赔偿。"/>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/colorWrite"
android:orientation="vertical"
android:paddingLeft="@dimen/size_15"
android:paddingRight="@dimen/size_15">
<TextView
android:id="@+id/tv_layout_member_hint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_15"
android:text="会员特权"
android:visibility="gone"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_16" />
<LinearLayout
android:id="@+id/ll_layout_member_hint"
android:layout_width="match_parent"
android:layout_height="@dimen/size_50"
android:visibility="gone"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="免费用车"
android:textColor="@color/textGray"
android:textSize="@dimen/text_12" />
<TextView
android:id="@+id/tv_free_car_days"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="（剩余1天）"
android:textColor="@color/textGray"
android:textSize="@dimen/text_12" />
<com.rv.component.control.SwitchButton
android:id="@+id/swbtn_member"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:sb_button_color="@color/colorWrite"
app:sb_checked_color="@color/gray_FFB74B"
app:sb_show_indicator="false"
app:sb_uncheckcircle_color="@color/textLightGrey" />
</LinearLayout>
<include layout="@layout/common_line" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="@dimen/size_50">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="使用优惠券"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_16" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:text="暂无优惠券"
android:textColor="@color/gray_FFB74B"
android:textSize="@dimen/text_14" />
</RelativeLayout>
</LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
......@@ -782,12 +745,16 @@
android:textColor="@color/textMain"
android:textSize="@dimen/text_16" />
<ImageView
android:layout_width="@dimen/size_16"
android:layout_height="@dimen/size_16"
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:src="@drawable/rv_common_icon_notice" />
android:drawableRight="@drawable/common_icon_rig_gray"
android:drawablePadding="@dimen/size_5"
android:text="详细说明"
android:textColor="@color/text_Gray"
android:textSize="@dimen/text_10" />
</RelativeLayout>
<LinearLayout
......@@ -800,9 +767,9 @@
android:id="@+id/tv_passenger_know"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:button="@drawable/selector_rv_check"
android:checked="true"
android:paddingLeft="@dimen/size_10"
android:button="@drawable/selector_rv_check"
android:text="@string/rv_passenger_security"
android:textColor="@color/textLightGrey"
android:textSize="@dimen/text_14" />
......@@ -821,8 +788,8 @@
<include layout="@layout/common_line" />
<LinearLayout
android:layout_width="match_parent"
android:id="@+id/ll_bottom"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/colorWrite"
android:orientation="horizontal">
......@@ -830,9 +797,9 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingBottom="@dimen/size_15"
android:paddingLeft="@dimen/size_15"
android:paddingTop="@dimen/size_15"
android:paddingBottom="@dimen/size_15"
android:text="@string/rv_pay_money_content"
android:textColor="@color/textMain"
android:textSize="@dimen/text_16" />
......@@ -858,8 +825,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/size_10"
android:drawablePadding="@dimen/size_2"
android:drawableRight="@drawable/rv_common_icon_down_arrow"
android:drawablePadding="@dimen/size_2"
android:text="@string/rv_detail"
android:textColor="@color/textMain" />
......
module_home/src/main/res/values/strings.xml
View file @ 2ff9794d
......@@ -77,7 +77,7 @@
<string name="rv_cancel">取消</string>
<string name="rv_shop_map">门店地图</string>
<string name="rv_select_car_num_hint">选择车辆数量</string>
<string name="rv_select_driving_num_hint">欣新专职司机（￥600/天）</string>
<string name="rv_select_driving_num_hint">欣新专职司机</string>
<string name="rv_user_driving">自驾</string>
<string name="rv_user_driving_hint">(需提供驾驶人信息)</string>
<string name="rv_driving_set">驾驶人设置</string>
......
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