Skip to content

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

bug修复

parent 792e7dad
Hide whitespace changes
Inline Side-by-side
Showing with 1087 additions and 685 deletions
module_home/build.gradle
View file @ f5a303ef
......@@ -41,6 +41,7 @@ dependencies {
api project(':component_utils')
api project(':component_control')
api project(':plugin_search')
api project(':plugin_calendar')
api project(':RvWrapper')
// api project(':RvTravel')
annotationProcessor'com.alibaba:arouter-compiler:1.1.4'
......
module_home/src/main/AndroidManifest.xml
View file @ f5a303ef
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.rv.home">
<application>
<activity android:name=".rv.module.ui.main.home.HomeFragment"></activity>
</application>
</manifest>
\ No newline at end of file
module_home/src/main/java/com/rv/home/rv/module/ApiConfig.java
View file @ f5a303ef
......@@ -33,7 +33,7 @@ public class ApiConfig {
public static String HTTP_URL_DRIVING_LIST = RvFrameConfig.VEHICLE_CAR_POST + "user/license/all";//驾驶证列表
public static String HTTP_URL_DELETE_DRIVING = RvFrameConfig.VEHICLE_CAR_POST + "user/license/del";//删除驾驶员
public static String HTTP_URL_CONFIRM_ORDER = RvFrameConfig.VEHICLE_ORDER + "orderRentVehicle/add";//确认订单
public static String HTTP_URL_GET_ORDER_PRICE = RvFrameConfig.VEHICLE_ORDER + "orderRentVehicle/app/unauth/calculate-price";//获得订单价格
public static String HTTP_URL_GET_ORDER_PRICE = RvFrameConfig.VEHICLE_ORDER + "orderRentVehicle/calculate-price";//获得订单价格
public static String HTTP_URL_WEIXIN_PAY = RvFrameConfig.VEHICLE_UPLOAD + "pay/app/wx";//微信支付
public static String HTTP_URL_ORDER_LIST = RvFrameConfig.VEHICLE_ORDER + "baseOrder/page";//订单列表
public static String HTTP_URL_PAY_THE_CALLBACK = RvFrameConfig.VEHICLE_ORDER + "baseOrder/pay";//订单支付
......@@ -64,4 +64,6 @@ public class ApiConfig {
public static String COMMIT_ORDER_PAY = RvFrameConfig.HOST + "/api/order/baseOrder/pay"; //订单支付
public static String HTTP_URL_VERSION_CHECK = "/api/app/version/app/unauth/info?version=%s"; // 检测版本
public static String HTTP_URL_FIND_BANNERLIST = RvFrameConfig.HOST + "/api/app/banner/app/unauth/findBannerlist"; // banner图接口
}
module_home/src/main/java/com/rv/home/rv/module/basic/BaseStatusActivity.java
View file @ f5a303ef
......@@ -55,9 +55,6 @@ public abstract class BaseStatusActivity<P extends MvpPresenter> extends SwipeBa
break;
}
}
......
module_home/src/main/java/com/rv/home/rv/module/basic/WebActivity.java
View file @ f5a303ef
......@@ -4,8 +4,12 @@ import android.content.Context;
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
import android.util.Log;
import android.widget.LinearLayout;
import com.alibaba.android.arouter.facade.annotation.Autowired;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.frame.base.url.Constance;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.ruiwenliu.wrapper.weight.webview.SafeWebView;
......@@ -15,6 +19,7 @@ import com.rv.home.R2;
import butterknife.BindView;
@Route(path = Constance.ACTIVITY_URL_WEBVIEW)
public class WebActivity extends BaseStatusActivity<PickerPresenter> {
@BindView(R2.id.webView)
......@@ -22,8 +27,11 @@ public class WebActivity extends BaseStatusActivity<PickerPresenter> {
@BindView(R2.id.lay_web)
LinearLayout mRoot;
@Autowired()
String title;
@Autowired()
String url;
@Autowired()
int type;
public static Intent getIntent(Context context, String title, String url) {
......@@ -51,6 +59,7 @@ public class WebActivity extends BaseStatusActivity<PickerPresenter> {
mWebView.loadUrl(url);
} else {
String baseUrl = url + "?type=" + type;
Log.i("webactivityactivyt", "initView: ----" +baseUrl);
mWebView.loadUrl(baseUrl);
}
}
......
module_home/src/main/java/com/rv/home/rv/module/basic/presenter/CommonPresenter.java
View file @ f5a303ef
......@@ -11,7 +11,6 @@ import com.ruiwenliu.wrapper.presenter.MvpPresenter;
public class CommonPresenter extends MvpPresenter {
@Override
/**
* 域名地址
......
module_home/src/main/java/com/rv/home/rv/module/basic/presenter/PickerPresenter.java
View file @ f5a303ef
......@@ -13,6 +13,7 @@ import android.provider.MediaStore;
import android.support.v4.content.FileProvider;
import com.base.utils.ui.datetime.selector.util.TextUtil;
import com.ruiwenliu.wrapper.util.FileStorage;
import java.io.BufferedOutputStream;
......@@ -39,6 +40,7 @@ public class PickerPresenter extends CommonPresenter {
private File imageFile;
private Uri cropUri;
public FileStorage fileStore = null;
private Uri outputUri;
/**
* 打开系统相机获取图片
......@@ -57,12 +59,12 @@ public class PickerPresenter extends CommonPresenter {
cropUri = FileProvider.getUriForFile(getPresenterContext(), getPresenterContext().getPackageName() +".fileProvider", imageFile);
intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); //添加这一句表示对目标应用临时授权该Uri所代表的文件
} else {//<24
cropUri = Uri.fromFile(imageFile);
}
intent.setAction(MediaStore.ACTION_IMAGE_CAPTURE);//设置Action为拍照
intent.putExtra(MediaStore.EXTRA_OUTPUT, cropUri);
// cameraUrl = String.format("%1$s%2$s", "file://", imageFile.getPath());//相机存储地址
cameraUrl = String.format("%1$s", imageFile.getPath());//相机存储地址
((Activity) getPresenterContext()).startActivityForResult(intent, isCrop ? TYPE_CAMERA_CROP_CODE : TYPE_CAMERA_CODE);
......@@ -77,7 +79,10 @@ public class PickerPresenter extends CommonPresenter {
* @return
*/
public String gerCameraStoreUrl() {
return cameraUrl;
if (new File(cameraUrl).exists()) {
return cameraUrl;
}
return "";
}
/**
......@@ -118,7 +123,7 @@ public class PickerPresenter extends CommonPresenter {
if (file == null && isViewAttached() == false) { //当地址存储为空或未绑定Activity 、fragment则不执行下面操作
return;
}
Uri outputUri = Uri.fromFile(file);//缩略图保存地址
outputUri = Uri.fromFile(file);//缩略图保存地址
Intent intent = new Intent("com.android.camera.action.CROP");
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
......
module_home/src/main/java/com/rv/home/rv/module/ui/login/RegisteredActivity.java
View file @ f5a303ef
......@@ -131,8 +131,9 @@ public class RegisteredActivity extends BaseLoginActivity<CommonPresenter> {
etPwd.setTransformationMethod(pwdShow ? HideReturnsTransformationMethod.getInstance() : PasswordTransformationMethod.getInstance());
} else if (view.getId() == R.id.iv_clear_pwd) {
confirmShow = !confirmShow;
ivClearAgainPwd.setSelected(confirmShow);
etAgainPwd.setTransformationMethod(confirmShow ? HideReturnsTransformationMethod.getInstance() : PasswordTransformationMethod.getInstance());
ivClearPwd.setSelected(confirmShow);
etPwd.setTransformationMethod(confirmShow ? HideReturnsTransformationMethod.getInstance() : PasswordTransformationMethod.getInstance());
} else if (view.getId() == R.id.iv_clear_again_pwd) {
confirmShow = !confirmShow;
ivClearAgainPwd.setSelected(confirmShow);
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/CarDetailActivity.java
View file @ f5a303ef
......@@ -185,29 +185,6 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
startActivity(ConfirmOrderActivity.getIntent(mActivity, dataBean, mCarBean, getIntent().getStringExtra("startTime"), getIntent().getStringExtra("endTime")));
finish();
}
// switch (view.getId()) {
// case R.id.iv_back:
//
// break;
// case R.id.iv_collect:
// break;
// case R.id.iv_share:
// if (shareManager != null) {
// shareManager.open();
// }
// break;
// case R.id.tv_appointment:
// if (TextUtils.isEmpty(MyApplication.TYPE_USER_TOKEN)) {
// RvFrameConfig.TYPE_LOGIN = 1;
// startActivity(LoginRvActivity.getIntent(mActivity));
// return;
// }
// startActivity(ConfirmOrderActivity.getIntent(mActivity, dataBean, mCarBean, getIntent().getStringExtra("startTime"), getIntent().getStringExtra("endTime")));
// finish();
// break;
// }
}
//添加收藏
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/ConfirmOrderActivity.java
View file @ f5a303ef
......@@ -18,13 +18,14 @@ import android.widget.PopupWindow;
import android.widget.RatingBar;
import android.widget.TextView;
import com.alibaba.android.arouter.launcher.ARouter;
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.base.url.Constance;
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;
......@@ -46,14 +47,15 @@ import com.rv.home.rv.module.ui.main.home.bean.DrivingListBean;
import com.rv.home.rv.module.ui.main.home.bean.OrderDataBean;
import com.rv.home.rv.module.ui.main.home.bean.OrderPayBean;
import com.rv.home.rv.module.ui.main.home.bean.OrderPriceBean;
import com.rv.home.rv.module.ui.main.home.bean.OrderPriceDetailBean;
import com.rv.home.rv.module.ui.main.home.dialog.OrderPriceDetailPw;
import com.rv.component.dialog.bean.OrderPriceDetailBean;
import com.rv.component.dialog.OrderPriceDetailPw;
import com.rv.home.rv.module.ui.main.home.order.OrderListActivity;
import com.tencent.mm.opensdk.modelpay.PayReq;
import com.tencent.mm.opensdk.openapi.IWXAPI;
import com.tencent.mm.opensdk.openapi.WXAPIFactory;
import com.yuyife.okgo.OkGoUtil;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.Map;
......@@ -148,6 +150,7 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
private OrderPriceBean priceBean;
BeanUserInfo.UserInfo info = null;
private int deductiblePriceType;
private int isMemberType;
public static Intent getIntent(Context context, OrderDataBean bean, CarTypeListBean.DataBeanX.DataBean carBean, String startTime, String endTime) {
return new Intent(context, ConfirmOrderActivity.class)
......@@ -170,7 +173,6 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
mCarBean = (CarTypeListBean.DataBeanX.DataBean) intent.getSerializableExtra("carBean");
intiView();
initRxBus();
}
@SuppressLint("CheckResult")
......@@ -208,11 +210,13 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
switch (requestType) {
case 0:
priceBean = (OrderPriceBean) result;
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();
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();
}
break;
case 1:
ConfirmOrderBean orderBean = (ConfirmOrderBean) result;
......@@ -252,7 +256,8 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
@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})
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,R2.id.tv_deposit_hint,R2.id.tv_privilege_service_hint,R2.id.tv_booking_instructions_hint})
public void onViewClicked(View view) {
int i = view.getId();
if (i == R.id.rl_goods) {
......@@ -275,6 +280,7 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
rbUserDriving.setChecked(false);
llAddDriving.setVisibility(View.GONE);
rbXinDriving.setChecked(true);
dataBean.setMyDriverIds("1");
getPayMoney();
} else if (i == R.id.rb_user_driving) {
drivingType = 2;
......@@ -309,6 +315,27 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
deductiblePriceType = 0;
}
getPayMoney();
}else if (i == R.id.tv_deposit_hint){
//欣新平台租车押金
ARouter.getInstance().build(Constance.ACTIVITY_URL_WEBVIEW)
.withString("title","欣新平台租车押金")
.withString("url",ApiConfig.HTTP_URL_CAR_TYPE_NOTICE)
.withInt("type",4)
.navigation();
}else if (i == R.id.tv_privilege_service_hint){
//尊享服务
ARouter.getInstance().build(Constance.ACTIVITY_URL_WEBVIEW)
.withString("title","尊享服务")
.withString("url",ApiConfig.HTTP_URL_CAR_TYPE_NOTICE)
.withInt("type",5)
.navigation();
}else if (i == R.id.tv_booking_instructions_hint){
//预订须知
ARouter.getInstance().build(Constance.ACTIVITY_URL_WEBVIEW)
.withString("title","预订须知")
.withString("url",ApiConfig.HTTP_URL_CAR_TYPE_NOTICE)
.withInt("type",2)
.navigation();
}
}
......@@ -321,16 +348,15 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
return;
}
if (tvPassengerKnow.isChecked() == false) {
showToast("请同意预定须知 ¥");
showToast("请同意预定须知");
return;
}
// showToast("token" +RvFrameConfig.APP_TOKEN);
new PaymentTypeSelection(mActivity) {
@Override
public void helper(final ViewHolder helper) {
super.helper(helper);
helper.setText(R.id.tv_amount, String.format("¥%1$s", priceBean.getData().getOrderAmount()));
helper.setText(R.id.tv_amount,tvPayMoney.getText().toString());
helper.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
......@@ -348,11 +374,9 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
showToast("该功能还没有开通！");
// helper.setChecked(R.id.rb_wechat,false);
// helper.setChecked(R.id.rb_alipay,true);
} else if (i == R.id.tv_pay_immediately) {
dismiss();
createOrder(1);
}
}
}, R.id.iv_close, R.id.ll_item_wechat, R.id.ll_item_alipay, R.id.tv_pay_immediately);
......@@ -375,13 +399,16 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
* 获得订单价格
*/
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, 0, ApiConfig.HTTP_URL_GET_ORDER_PRICE, OrderPriceBean.class, map, true);
mPresenter.getData(RvFrameConfig.VEHICLE_ORDER, 0, ApiConfig.HTTP_URL_GET_ORDER_PRICE, OrderPriceBean.class, map,headMap, true);
}
/**
......@@ -429,10 +456,13 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
@Override
public void onCheckedChanged(SwitchButton view, boolean isChecked) {
if (isChecked) {
isMemberType = 1;
dataBean.setRentFreeDay(1);
} else {
dataBean.setRentFreeDay(0);
isMemberType = 0;
}
getPayMoney();
}
});
}
......@@ -441,17 +471,62 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
* 支付价格计算
*/
private void getPayMoney() {
if (priceBean.getData() ==null){
return;
}
ArrayList<OrderPriceDetailBean.ChildrenBean> childrenBeanList = new ArrayList<>(); //费用明细
double payMoney = 0.00;
double dayPrice = mCarBean.getVehicleModel().getSum();
int dayNum = dataBean.getDayNum();
payMoney = dayPrice * dayNum + priceBean.getData().getDeposit(); //租车和押金价格
if (isMemberType ==0) { //是否使用会员 0 不使用
payMoney = dayPrice * dayNum + priceBean.getData().getDeposit(); //租车和押金价格
OrderPriceDetailBean.ChildrenBean childrenBean2 = new OrderPriceDetailBean.ChildrenBean();
childrenBean2.setKey("车辆租赁费");
childrenBean2.setDetail("¥"+ dayPrice +"/天 *"+dayNum +"天" );
childrenBean2.setVal("¥" + dayPrice * dayNum);
childrenBeanList.add(childrenBean2);
}else {
if (info !=null){
if (dayNum >info.getRentFreeDays()){
payMoney = dayPrice *(dayNum -info.getRentFreeDays()) + priceBean.getData().getDeposit();
OrderPriceDetailBean.ChildrenBean childrenBean1 = new OrderPriceDetailBean.ChildrenBean();
childrenBean1.setKey("车辆租赁费");
childrenBean1.setDetail("¥"+ dayPrice +"/天 *"+ (dayNum -info.getRentFreeDays()) +"天" );
childrenBean1.setVal("¥" + dayPrice *(dayNum -info.getRentFreeDays()));
childrenBeanList.add(childrenBean1);
}else if (dayNum <= info.getRentFreeDays()){
payMoney = priceBean.getData().getDeposit();
}
}
}
if (drivingType == 1) {
payMoney = payMoney + priceBean.getData().getDriverAmount(); // + 专职司机
OrderPriceDetailBean.ChildrenBean childrenBean3 = new OrderPriceDetailBean.ChildrenBean();
childrenBean3.setKey("专职司机服务费");
childrenBean3.setDetail("¥"+ priceBean.getData().getDriverPrice() +"/天 *"+dayNum +"天" );
childrenBean3.setVal("¥" + priceBean.getData().getDriverAmount());
childrenBeanList.add(childrenBean3);
}
if (deductiblePriceType ==1){
payMoney = payMoney +priceBean.getData().getDamageSafePrice() * dayNum; //+免赔付价格
OrderPriceDetailBean.ChildrenBean childrenBean4 = new OrderPriceDetailBean.ChildrenBean();
childrenBean4.setKey("车损免赔费");
childrenBean4.setDetail("¥"+ priceBean.getData().getDamageSafePrice() +"/天 *"+dayNum +"天" );
childrenBean4.setVal("¥" + priceBean.getData().getDamageSafePrice() * dayNum);
childrenBeanList.add(childrenBean4);
}
tvPayMoney.setText(String.format("¥%1$s", payMoney));
orderPriceDetailBean = new OrderPriceDetailBean();
orderPriceDetailBean.setKey("费用明细");
OrderPriceDetailBean.ChildrenBean childrenBean = new OrderPriceDetailBean.ChildrenBean();
childrenBean.setKey("租房车押金");
childrenBean.setVal("¥"+priceBean.getData().getDeposit());
childrenBeanList.add(childrenBean);
orderPriceDetailBean.setChildren(childrenBeanList);
}
private String getContent(String name, String card) {
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/adapter/HotCarTypeAdapter.java
View file @ f5a303ef
......@@ -22,11 +22,13 @@ public class HotCarTypeAdapter extends BaseQuickAdapter<HomeHotGoodListBean.Data
@Override
protected void convert(BaseGlideHolder helper, HomeHotGoodListBean.DataBean bean) {
helper.loadRoundImage(mContext,bean.getImgUrl(), (ImageView) helper.getView(R.id.iv_goods),10);
helper.loadRoundImage(mContext,bean.getImgUrl(), (ImageView) helper.getView(R.id.iv_goods),6);
helper.setText(R.id.tv_name,bean.getName());
helper.setText(R.id.tv_content,bean.getName1());
if (!TextUtil.isEmpty(bean.getPrice())) {
helper.setText(R.id.tv_price, String.format("¥%1$s%2$s", bean.getPrice(), mContext.getString(R.string.rv_day)));
}else {
helper.setText(R.id.tv_price,"");
}
}
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/adapter/RVEnthusiastAdapter.java
View file @ f5a303ef
......@@ -18,7 +18,7 @@ public class RVEnthusiastAdapter extends BaseQuickAdapter<String, BaseGlideHolde
@Override
protected void convert(BaseGlideHolder helper, String string) {
helper.loadRoundImage(mContext,string,(ImageView)helper.getView(R.id.iv_activity),10);
helper.loadRoundImage(mContext,string,(ImageView)helper.getView(R.id.iv_activity),6);
// GlideManager.getInstance(mContext).loadRoundImage(string, (ImageView)helper.getView(R.id.iv_activity),20);
// ViewGroup.LayoutParams layoutParams = helper.getView(R.id.ll_item_rv_enthusiast).getLayoutParams();
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/adapter/RVTourListAdapter.java
View file @ f5a303ef
......@@ -18,7 +18,7 @@ public class RVTourListAdapter extends BaseQuickAdapter<HomePopularBrigade.DataB
@Override
protected void convert(BaseGlideHolder helper, HomePopularBrigade.DataBean bean) {
helper.loadRoundImage(mContext,bean.getImg(), (ImageView) helper.getView(R.id.iv_rv_tour),20);
helper.loadRoundImage(mContext,bean.getImg(), (ImageView) helper.getView(R.id.iv_rv_tour),6);
// GlideManager.getInstance(mContext).loadImage(bean.getImg(), (ImageView)helper.getView(R.id.iv_rv_tour));
}
}
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/adapter/SelectedEventsAdapter.java
View file @ f5a303ef
......@@ -15,6 +15,6 @@ public class SelectedEventsAdapter extends BaseQuickAdapter<String, BaseGlideHol
@Override
protected void convert(BaseGlideHolder helper, String string) {
GlideManager.getInstance(mContext).loadRoundImage(string, (ImageView)helper.getView(R.id.iv_activity),20);
GlideManager.getInstance(mContext).loadRoundImage(string, (ImageView)helper.getView(R.id.iv_activity),6);
}
}
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/bean/BeanHomeBanner.java 0 → 100644
View file @ f5a303ef
package com.rv.home.rv.module.ui.main.home.bean;
import com.ruiwenliu.wrapper.base.BaseBean;
import java.io.Serializable;
import java.util.List;
public class BeanHomeBanner extends BaseBean {
private List<DataBean> data;
private int code;
public List<DataBean> getData() {
return data;
}
public void setData( List<DataBean> data) {
this.data = data;
}
public int getCode() {
return code;
}
public void setCode(int code) {
this.code = code;
}
public static class DataBean implements Serializable {
private String id;//1,
private String title;//"首页",
private String cover;//"http://quanzilife.oss-cn-shenzhen.aliyuncs.com/zhrs_test/admin/hhBwsHpKHj.png",
private String crtName;//"admin",
private String crtTime;//20180822101653,
private String updTime;//20181229143002,
private String url;//"http://www.sczhrs.gov.cn/app/index/policies/policiesH5?id=5",
private String isDel;//0,
private String rank;//0
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
public String getCover() {
return cover;
}
public void setCover(String cover) {
this.cover = cover;
}
public String getCrtName() {
return crtName;
}
public void setCrtName(String crtName) {
this.crtName = crtName;
}
public String getCrtTime() {
return crtTime;
}
public void setCrtTime(String crtTime) {
this.crtTime = crtTime;
}
public String getUpdTime() {
return updTime;
}
public void setUpdTime(String updTime) {
this.updTime = updTime;
}
public String getUrl() {
return url;
}
public void setUrl(String url) {
this.url = url;
}
public String getIsDel() {
return isDel;
}
public void setIsDel(String isDel) {
this.isDel = isDel;
}
public String getRank() {
return rank;
}
public void setRank(String rank) {
this.rank = rank;
}
}
}
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/bean/CarTypeListBean.java
View file @ f5a303ef
......@@ -161,7 +161,6 @@ public class CarTypeListBean extends BaseBean implements Serializable {
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);
......@@ -180,8 +179,8 @@ public class CarTypeListBean extends BaseBean implements Serializable {
if (0 == rentDiscountStatus) {
amount = price;
} else if (1 == rentDiscountStatus) {
int discount = info.getDiscount();
amount = price * (discount / 100);
double discount = info.getDiscount() * 0.01;
amount = price * discount;
} else if (2 == rentDiscountStatus) {
if (!TextUtil.isEmpty(rentDiscountPrice)){
String[] list = rentDiscountPrice.split(",");
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/CancelTheTripActivity.java
View file @ f5a303ef
......@@ -9,6 +9,8 @@ import android.text.TextUtils;
import android.view.View;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.frame.base.bus.CancelOrderEvent;
import com.frame.base.bus.RxBus;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.util.ViewHolder;
......@@ -49,7 +51,7 @@ public class CancelTheTripActivity extends BaseStatusActivity<PickerPresenter> {
public void onShowResult(int requestType, BaseBean result) {
switch (requestType) {
case 0:
setResult(RESULT_OK);
RxBus.post(new CancelOrderEvent());
finish();
break;
}
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/ForPaymentFragment.java
View file @ f5a303ef
package com.rv.home.rv.module.ui.main.home.order;
import android.annotation.SuppressLint;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.Nullable;
......@@ -7,8 +8,14 @@ import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.view.View;
import com.alibaba.android.arouter.launcher.ARouter;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.entity.MultiItemEntity;
import com.frame.base.bus.CancelOrderEvent;
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;
import com.ruiwenliu.wrapper.base.BaseFragment;
......@@ -33,6 +40,8 @@ import java.util.LinkedHashMap;
import java.util.Map;
import butterknife.BindView;
import io.reactivex.functions.Consumer;
import io.reactivex.schedulers.Schedulers;
/**
* Created :Auser
......@@ -73,6 +82,7 @@ public class ForPaymentFragment extends BaseFragment<CommonPresenter> implements
mSimpleRefreshLayout.setHeaderView(new SimpleRefreshView(_mActivity));
mSimpleRefreshLayout.setOnSimpleRefreshListener(this);
recyclerView.setAdapter(mAdapter);
initRxBus();
mAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
......@@ -109,6 +119,19 @@ public class ForPaymentFragment extends BaseFragment<CommonPresenter> implements
}
@SuppressLint("CheckResult")
private void initRxBus() {
RxBus.tObservable(CancelOrderEvent.class)
.observeOn(Schedulers.newThread())
.subscribe(new Consumer<CancelOrderEvent>() {
@Override
public void accept(CancelOrderEvent event) throws Exception {
onRefresh();
}
});
}
@Override
public void onShowResult(int requestType, BaseBean result) {
switch (requestType) {
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/OrderDetailActivity.java
View file @ f5a303ef
package com.rv.home.rv.module.ui.main.home.order;
import android.annotation.SuppressLint;
import android.content.ClipboardManager;
import android.content.Context;
import android.content.Intent;
......@@ -15,11 +16,15 @@ import android.webkit.WebViewClient;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.alibaba.android.arouter.launcher.ARouter;
import com.frame.base.bus.CancelOrderEvent;
import com.frame.base.bus.RxBus;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.util.ViewHolder;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.component.dialog.PaymentTypeSelection;
import com.rv.component.utils.ClipboardUtil;
import com.rv.home.R;
import com.rv.home.R2;
import com.rv.home.rv.module.ApiConfig;
......@@ -39,6 +44,8 @@ import java.util.Map;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import io.reactivex.functions.Consumer;
import io.reactivex.schedulers.Schedulers;
import static com.ruiwenliu.wrapper.weight.webview.SafeWebView.hasKitkat;
......@@ -125,6 +132,7 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
@Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
showTitle(false);
initRxBus();
api = WXAPIFactory.createWXAPI(mActivity, RvFrameConfig.APP_ID);
dataBean = (OrderListBean.DataBeanX.DataBean) intent.getSerializableExtra("dataBean");
if (dataBean !=null){
......@@ -171,6 +179,19 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
}
}
@SuppressLint("CheckResult")
private void initRxBus() {
RxBus.tObservable(CancelOrderEvent.class)
.observeOn(Schedulers.newThread())
.subscribe(new Consumer<CancelOrderEvent>() {
@Override
public void accept(CancelOrderEvent event) throws Exception {
finish();
}
});
}
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
......@@ -400,11 +421,13 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
}
@JavascriptInterface
public ClipboardManager getCopy() {
ClipboardManager clip = (ClipboardManager) mActivity.getSystemService(Context.CLIPBOARD_SERVICE);
clip.setText(no);
showToast("复制成功！");
return clip;
public void getCopy() {
mWebView.post(new Runnable() {
@Override
public void run() {
ClipboardUtil.setText(mActivity,no);
}
});
}
@JavascriptInterface
......@@ -414,9 +437,7 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
@JavascriptInterface
public void showMore() {
// startActivity(CarDetailActivity.getIntent(mActivity, 1));
showToast("再看看");
// ARouter.getInstance().build().navigation();
}
}
}
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/OrderListActivity.java
View file @ f5a303ef
......@@ -3,6 +3,7 @@ package com.rv.home.rv.module.ui.main.home.order;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.view.ViewPager;
import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.RecyclerView;
......@@ -140,6 +141,10 @@ public class OrderListActivity extends BaseStatusActivity<PickerPresenter> {
return list;
}
@Override
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
mAdapter.getCurrentFragment().onActivityResult(requestCode, resultCode, data);
}
}
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/ToTravelFragment.java
View file @ f5a303ef
package com.rv.home.rv.module.ui.main.home.order;
import android.annotation.SuppressLint;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v7.widget.LinearLayoutManager;
......@@ -8,6 +9,8 @@ import android.view.View;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.entity.MultiItemEntity;
import com.frame.base.bus.CancelOrderEvent;
import com.frame.base.bus.RxBus;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseFragment;
......@@ -26,6 +29,8 @@ import java.util.LinkedHashMap;
import java.util.Map;
import butterknife.BindView;
import io.reactivex.functions.Consumer;
import io.reactivex.schedulers.Schedulers;
/**
* Created :Auser
......@@ -57,6 +62,7 @@ public class ToTravelFragment extends BaseFragment<CommonPresenter> implements B
@Override
protected void initView(Bundle savedInstanceState) {
initRxBus();
recyclerView.setLayoutManager(new LinearLayoutManager(_mActivity));
mAdapter = new ToTravelAdapter(new ArrayList<MultiItemEntity>());
mAdapter.setOnLoadMoreListener(this, recyclerView);
......@@ -95,6 +101,20 @@ public class ToTravelFragment extends BaseFragment<CommonPresenter> implements B
}
@SuppressLint("CheckResult")
private void initRxBus() {
RxBus.tObservable(CancelOrderEvent.class)
.observeOn(Schedulers.newThread())
.subscribe(new Consumer<CancelOrderEvent>() {
@Override
public void accept(CancelOrderEvent event) throws Exception {
onRefresh();
}
});
}
@Override
public void onShowResult(int requestType, BaseBean result) {
switch (requestType) {
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/TravelOrderDetailsActivity.java
View file @ f5a303ef
package com.rv.home.rv.module.ui.main.home.order;
import android.annotation.SuppressLint;
import android.content.ClipboardManager;
import android.content.Context;
import android.content.Intent;
......@@ -15,6 +16,8 @@ import android.webkit.WebViewClient;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.frame.base.bus.CancelOrderEvent;
import com.frame.base.bus.RxBus;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseStatusActivity;
......@@ -38,6 +41,8 @@ import java.util.Map;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import io.reactivex.functions.Consumer;
import io.reactivex.schedulers.Schedulers;
import static com.ruiwenliu.wrapper.weight.webview.SafeWebView.hasKitkat;
......@@ -114,6 +119,7 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
@Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
showTitle(false);
initRxBus();
api = WXAPIFactory.createWXAPI(mActivity, RvFrameConfig.APP_ID);
dataBean = (OrderListBean.DataBeanX.DataBean) intent.getSerializableExtra("dataBean");
if (dataBean !=null) {
......@@ -174,6 +180,20 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
}
}
@SuppressLint("CheckResult")
private void initRxBus() {
RxBus.tObservable(CancelOrderEvent.class)
.observeOn(Schedulers.newThread())
.subscribe(new Consumer<CancelOrderEvent>() {
@Override
public void accept(CancelOrderEvent event) throws Exception {
finish();
}
});
}
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/adapter/HaveToTravelAdapter.java
View file @ f5a303ef
......@@ -23,11 +23,13 @@ import java.util.List;
public class HaveToTravelAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,BaseGlideHolder> {
public static final int TYPE_FOR_PAYMENT=1;
public static final int TYPE_TO_TRAVEL=2;
public static final int TYPE_TO_MEMBER = 3;
public HaveToTravelAdapter(List<MultiItemEntity> data) {
super(data);
addItemType(TYPE_FOR_PAYMENT, R.layout.rv_item_order_for_payment);
addItemType(TYPE_TO_TRAVEL, R.layout.rv_item_order_to_travel);
addItemType(TYPE_TO_MEMBER, R.layout.rv_item_order_to_member);
}
@Override
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/adapter/ToTravelAdapter.java
View file @ f5a303ef
......@@ -23,11 +23,13 @@ import java.util.List;
public class ToTravelAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity, BaseGlideHolder> {
public static final int TYPE_FOR_PAYMENT = 1;
public static final int TYPE_TO_TRAVEL = 2;
public static final int TYPE_TO_MEMBER = 3;
public ToTravelAdapter(List<MultiItemEntity> data) {
super(data);
addItemType(TYPE_FOR_PAYMENT, R.layout.rv_item_order_for_payment);
addItemType(TYPE_TO_TRAVEL, R.layout.rv_item_order_to_travel);
addItemType(TYPE_TO_MEMBER, R.layout.rv_item_order_to_member);
}
@Override
......@@ -74,6 +76,8 @@ public class ToTravelAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
helper.setText(R.id.tv_camp_process, mContext.getString(R.string.tv_boarding));
helper.addOnClickListener(R.id.tv_camp_process);
break;
case TYPE_TO_MEMBER:
break;
}
}
......
module_home/src/main/res/drawable/selector_home_item_button_left.xml
View file @ f5a303ef
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/icon_home_item_button_left" android:state_selected="true"/>
<item android:drawable="@drawable/icon_home_item_button" android:state_selected="false"/>
<item android:drawable="@drawable/icon_home_item_button_left_bottom" android:state_selected="false"/>
</selector>
\ No newline at end of file
module_home/src/main/res/drawable/selector_home_item_button_right.xml
View file @ f5a303ef
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/icon_home_item_button_right" android:state_selected="true"/>
<item android:drawable="@drawable/icon_home_item_button" android:state_selected="false"/>
<item android:drawable="@drawable/icon_home_item_button_right_bottom" android:state_selected="false"/>
</selector>
\ No newline at end of file
module_home/src/main/res/drawable/selector_home_item_hot_button.xml 0 → 100644
View file @ f5a303ef
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/icon_home_hot_selected" android:state_selected="true"/>
<item android:drawable="@drawable/icon_home_hot_unselected" android:state_selected="false"/>
</selector>
\ No newline at end of file
module_home/src/main/res/drawable/shape_home_layout_circle_shadow.xml 0 → 100644
View file @ f5a303ef
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<padding
android:bottom="2dp"
android:left="2dp"
android:right="2dp"
android:top="2dp" />
<solid android:color="#0D171413" />
<corners android:radius="8dp" />
</shape>
</item>
<item>
<shape android:shape="rectangle">
<padding
android:bottom="1dp"
android:left="1dp"
android:right="1dp"
android:top="1dp" />
<solid android:color="#10171413" />
<corners android:radius="8dp" />
</shape>
</item>
<item>
<shape android:shape="rectangle">
<padding
android:bottom="1dp"
android:left="1dp"
android:right="1dp"
android:top="1dp" />
<solid android:color="#12171413" />
<corners android:radius="8dp" />
</shape>
</item>
<item>
<shape android:shape="rectangle">
<padding
android:bottom="0.5dp"
android:left="0.5dp"
android:right="0.5dp"
android:top="0.5dp" />
<solid android:color="#17171413" />
<corners android:radius="8dp" />
</shape>
</item>
<item>
<shape>
<solid android:color="#FFFFFF" />
<corners android:radius="5dp" />
</shape>
</item>
</layer-list>
\ No newline at end of file
module_home/src/main/res/drawable/shape_home_layout_circle_shadow2.xml 0 → 100644
View file @ f5a303ef
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<solid android:color="#20171413" />
<corners android:radius="5dp" />
</shape>
</item>
</layer-list>
\ No newline at end of file
module_home/src/main/res/drawable/shape_rv_button_gray_circle.xml 0 → 100644
View file @ f5a303ef
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="50dp" />
<solid android:color="@color/colorLine" />
</shape>
\ No newline at end of file
module_home/src/main/res/layout/fragment_home.xml
View file @ f5a303ef
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorLine"
android:orientation="vertical">
<com.rv.component.utils.ObservableScrollView
android:id="@+id/scrollview"
android:focusable="true"
android:focusableInTouchMode="true"
<com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/refresh"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="match_parent">
<LinearLayout
<com.rv.component.utils.ObservableScrollView
android:id="@+id/scrollview"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:layout_height="wrap_content">
<RelativeLayout
android:id="@+id/rl_item_layout"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/size_580">
android:layout_height="match_parent"
android:descendantFocusability="beforeDescendants"
android:focusable="true"
android:focusableInTouchMode="true"
android:orientation="vertical">
<com.yuyife.banner.Banner
android:id="@+id/mine_banner"
<RelativeLayout
android:id="@+id/rl_item_layout"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="@dimen/size_580">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<com.yuyife.banner.Banner
android:id="@+id/mine_banner"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginTop="@dimen/size_240"
android:layout_marginRight="@dimen/size_15"
android:background="@drawable/shape_rv_bg_write"
android:orientation="vertical"
android:paddingBottom="@dimen/size_15">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/size_50"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_item_rv_tour"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/selector_home_item_button_left"
android:gravity="center"
android:text="租房车"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_16" />
<TextView
android:id="@+id/tv_item_renting_a_car"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/selector_home_item_button_right"
android:gravity="center"
android:text="房车游"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_16" />
</LinearLayout>
android:layout_height="match_parent"
android:background="@drawable/aa_image_banner"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/size_245"
android:orientation="vertical"
android:paddingLeft="@dimen/size_15"
android:paddingRight="@dimen/size_15">
android:layout_height="match_parent"
android:layout_marginTop="@dimen/size_240">
<LinearLayout
android:id="@+id/ll_layout_renting_a_car"
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:layout_margin="@dimen/size_15"
app:cardBackgroundColor="@color/colorWrite"
app:cardCornerRadius="10dp"
app:cardElevation="15dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_10"
android:layout_marginBottom="@dimen/size_10"
android:orientation="horizontal">
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/rv_get_car_address"
android:textColor="@color/textLightGrey"
android:textSize="@dimen/text_14" />
<TextView
android:id="@+id/tv_get_city"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_10"
android:drawableRight="@drawable/rv_common_icon_up_arrow"
android:drawablePadding="@dimen/size_3"
android:gravity="center"
android:hint="@string/rv_city_list"
android:text=""
android:textColor="@color/textMain"
android:textSize="@dimen/text_14" />
</LinearLayout>
<TextView
android:id="@+id/tv_get_address"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginRight="@dimen/size_15"
android:layout_weight="1"
android:layout_height="@dimen/size_50"
android:gravity="center"
android:hint="@string/rv_get_car_hint"
android:textSize="@dimen/text_14" />
<Switch
android:id="@+id/switch_get"
android:layout_width="wrap_content"
android:layout_height="@dimen/size_20"
android:layout_gravity="center_vertical"
android:showText="true"
android:switchTextAppearance="@style/SwitchTheme"
android:textOff="@string/rv_to_shop"
android:textOn="@string/rv_to_door"
android:thumb="@drawable/switch_custom_thumb_selector"
android:track="@drawable/switch_custom_track_selector"
android:visibility="gone" />
</LinearLayout>
<include layout="@layout/common_line" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_15"
android:layout_marginBottom="@dimen/size_10"
android:orientation="horizontal">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/rv_get_out_address"
android:textColor="@color/textLightGrey"
android:textSize="@dimen/text_14" />
android:id="@+id/tv_item_rv_tour"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/selector_home_item_button_left"
android:gravity="center"
android:text="租房车"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_16" />
<TextView
android:id="@+id/tv_out_city"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_10"
android:drawableRight="@drawable/rv_common_icon_up_arrow"
android:drawablePadding="@dimen/size_3"
android:id="@+id/tv_item_renting_a_car"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/selector_home_item_button_right"
android:gravity="center"
android:hint="@string/rv_city_list"
android:text=""
android:textColor="@color/textMain"
android:textSize="@dimen/text_14" />
android:text="房车游"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_16" />
</LinearLayout>
<TextView
android:id="@+id/tv_out_address"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginRight="@dimen/size_15"
android:layout_weight="1"
android:gravity="center"
android:hint="@string/rv_get_out_hint"
android:textSize="@dimen/text_14" />
<Switch
android:id="@+id/switch_out"
android:layout_width="wrap_content"
android:layout_height="@dimen/size_20"
android:layout_gravity="center_vertical"
android:showText="true"
android:switchTextAppearance="@style/SwitchTheme"
android:textColor="@color/colorWrite"
android:textOff="@string/rv_to_shop"
android:textOn="@string/rv_to_door"
android:thumb="@drawable/switch_custom_thumb_selector"
android:track="@drawable/switch_custom_track_selector"
android:visibility="gone" />
</LinearLayout>
<include layout="@layout/common_line" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/size_60"
android:gravity="center_vertical"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/ll_item_get_time"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="horizontal">
android:layout_width="match_parent"
android:layout_height="@dimen/size_245"
android:orientation="vertical"
android:paddingLeft="@dimen/size_15"
android:paddingRight="@dimen/size_15">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="@drawable/shape_rv_bg_yellow"
android:paddingLeft="@dimen/size_5"
android:paddingTop="@dimen/size_3"
android:paddingRight="@dimen/size_5"
android:paddingBottom="@dimen/size_3"
android:text="@string/rv_get"
android:textColor="@color/colorWrite"
android:textSize="@dimen/text_10" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_5"
android:gravity="center"
android:id="@+id/ll_layout_renting_a_car"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:id="@+id/tv_get_time"
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_10"
android:layout_marginBottom="@dimen/size_10"
android:orientation="horizontal">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/rv_get_car_address"
android:textColor="@color/textLightGrey"
android:textSize="@dimen/text_14" />
<TextView
android:id="@+id/tv_get_city"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_10"
android:drawableRight="@drawable/rv_common_icon_up_arrow"
android:drawablePadding="@dimen/size_3"
android:gravity="center"
android:hint="@string/rv_city_list"
android:text=""
android:textColor="@color/textMain"
android:textSize="@dimen/text_14" />
</LinearLayout>
<TextView
android:id="@+id/tv_get_address"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginRight="@dimen/size_15"
android:layout_weight="1"
android:gravity="center"
android:hint="@string/rv_get_car_hint"
android:textSize="@dimen/text_14" />
<Switch
android:id="@+id/switch_get"
android:layout_width="wrap_content"
android:layout_height="@dimen/size_20"
android:layout_gravity="center_vertical"
android:showText="true"
android:switchTextAppearance="@style/SwitchTheme"
android:textOff="@string/rv_to_shop"
android:textOn="@string/rv_to_door"
android:thumb="@drawable/switch_custom_thumb_selector"
android:track="@drawable/switch_custom_track_selector"
android:visibility="gone" />
</LinearLayout>
<include layout="@layout/common_line" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_15"
android:layout_marginBottom="@dimen/size_10"
android:orientation="horizontal">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/rv_get_out_address"
android:textColor="@color/textLightGrey"
android:textSize="@dimen/text_14" />
<TextView
android:id="@+id/tv_out_city"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_10"
android:drawableRight="@drawable/rv_common_icon_up_arrow"
android:drawablePadding="@dimen/size_3"
android:gravity="center"
android:hint="@string/rv_city_list"
android:text=""
android:textColor="@color/textMain"
android:textSize="@dimen/text_14" />
</LinearLayout>
<TextView
android:id="@+id/tv_out_address"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginRight="@dimen/size_15"
android:layout_weight="1"
android:gravity="center"
android:hint="@string/rv_get_out_hint"
android:textSize="@dimen/text_14" />
<Switch
android:id="@+id/switch_out"
android:layout_width="wrap_content"
android:layout_height="@dimen/size_20"
android:layout_gravity="center_vertical"
android:showText="true"
android:switchTextAppearance="@style/SwitchTheme"
android:textColor="@color/colorWrite"
android:textOff="@string/rv_to_shop"
android:textOn="@string/rv_to_door"
android:thumb="@drawable/switch_custom_thumb_selector"
android:track="@drawable/switch_custom_track_selector"
android:visibility="gone" />
</LinearLayout>
<include layout="@layout/common_line" />
<LinearLayout
android:id="@+id/ll_item_select_data"
android:layout_width="match_parent"
android:layout_height="@dimen/size_60"
android:gravity="center_vertical"
android:text="2019-22"
android:textColor="@color/textGray"
android:textSize="@dimen/text_12" />
<TextView
android:id="@+id/tv_get_week"
android:layout_width="wrap_content"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/ll_item_get_time"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="@drawable/shape_rv_bg_yellow_small"
android:paddingLeft="@dimen/size_5"
android:paddingTop="@dimen/size_3"
android:paddingRight="@dimen/size_5"
android:paddingBottom="@dimen/size_3"
android:text="@string/rv_get"
android:textColor="@color/colorWrite"
android:textSize="@dimen/text_10" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_5"
android:gravity="center"
android:orientation="vertical">
<TextView
android:id="@+id/tv_get_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:text="2019-22"
android:textColor="@color/textGray"
android:textSize="@dimen/text_12" />
<TextView
android:id="@+id/tv_get_week"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="周三"
android:textColor="@color/textGray"
android:textSize="@dimen/text_12" />
</LinearLayout>
</LinearLayout>
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<TextView
android:id="@+id/tv_day"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:drawableBottom="@color/colorLine"
android:gravity="center"
android:text="3天"
android:textSize="@dimen/text_14" />
</RelativeLayout>
<LinearLayout
android:id="@+id/ll_item_alsotime"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical|right"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="@drawable/shape_rv_main_small"
android:paddingLeft="@dimen/size_5"
android:paddingTop="@dimen/size_3"
android:paddingRight="@dimen/size_5"
android:paddingBottom="@dimen/size_3"
android:text="@string/rv_out"
android:textColor="@color/colorWrite"
android:textSize="@dimen/text_10" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_5"
android:gravity="center"
android:orientation="vertical">
<TextView
android:id="@+id/tv_out_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:text="2019-22"
android:textColor="@color/textGray"
android:textSize="@dimen/text_12" />
<TextView
android:id="@+id/tv_out_week"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="周五"
android:textColor="@color/textGray"
android:textSize="@dimen/text_12" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="周三"
android:textColor="@color/textGray"
android:textSize="@dimen/text_12" />
android:gravity="center_vertical"
android:orientation="horizontal">
<android.support.v7.widget.CardView
android:layout_width="0dp"
android:layout_height="@dimen/size_40"
android:layout_weight="1"
app:cardCornerRadius="@dimen/size_50"
app:cardElevation="5dp"
app:cardMaxElevation="@dimen/size_15">
<TextView
android:id="@+id/tv_select_car"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/home_button_select_car"
android:gravity="center"
android:text="立即选车"
android:textColor="@color/colorWrite"
android:textSize="@dimen/text_14" />
</android.support.v7.widget.CardView>
<TextView
android:id="@+id/tv_car_rental_guide"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_20"
android:drawableRight="@drawable/common_icon_rig_black"
android:drawablePadding="@dimen/size_2"
android:text="租车指南"
android:textColor="@color/textGray"
android:textSize="@dimen/text_12" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<TextView
android:id="@+id/tv_day"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:drawableBottom="@color/colorLine"
android:gravity="center"
android:text="3天"
android:textSize="@dimen/text_14" />
</RelativeLayout>
<LinearLayout
android:id="@+id/ll_item_alsotime"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical|right"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="@drawable/shape_rv_main"
android:paddingLeft="@dimen/size_5"
android:paddingTop="@dimen/size_3"
android:paddingRight="@dimen/size_5"
android:paddingBottom="@dimen/size_3"
android:text="@string/rv_out"
android:textColor="@color/colorWrite"
android:textSize="@dimen/text_10" />
<LinearLayout
android:layout_width="wrap_content"
android:id="@+id/ll_layout_rv_tour"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_5"
android:gravity="center"
android:orientation="vertical">
android:layout_gravity="center"
android:orientation="vertical"
android:visibility="gone">
<LinearLayout
android:id="@+id/ll_item_rv_city"
android:layout_width="match_parent"
android:layout_height="@dimen/size_60"
android:layout_marginTop="@dimen/size_10"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_rv_city"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="请选择目的地城市"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_15" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_10"
android:src="@drawable/rv_common_icon_up_arrow" />
</LinearLayout>
<include layout="@layout/common_line" />
<TextView
android:id="@+id/tv_out_time"
android:layout_width="wrap_content"
android:id="@+id/tv_book_now"
android:layout_width="match_parent"
android:layout_height="@dimen/size_40"
android:layout_marginTop="@dimen/size_20"
android:background="@drawable/home_button_select_car"
android:gravity="center"
android:text="立即预订"
android:textColor="@color/colorWrite"
android:textSize="@dimen/text_16" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_20"
android:gravity="center_vertical"
android:text="2019-22"
android:textColor="@color/textGray"
android:textSize="@dimen/text_12" />
<TextView
android:id="@+id/tv_out_week"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="周五"
android:textColor="@color/textGray"
android:textSize="@dimen/text_12" />
android:orientation="horizontal">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1">
<TextView
android:layout_width="@dimen/size_50"
android:layout_height="@dimen/size_20"
android:background="@drawable/shape_rv_bg_crimson_xiao_fang"
android:gravity="center"
android:text="热门"
android:textColor="@color/colorWrite"
android:textSize="@dimen/text_10" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_item_rv_hot_label1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1">
<TextView
android:id="@+id/tv_rv_hot_label1"
android:layout_width="@dimen/size_60"
android:layout_height="@dimen/size_35"
android:background="@drawable/shape_rv_dark_gray_circle"
android:ellipsize="end"
android:gravity="center"
android:maxLength="3"
android:singleLine="true"
android:textColor="@color/textGray"
android:textSize="@dimen/text_12" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_item_rv_hot_label2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1">
<TextView
android:id="@+id/tv_rv_hot_label2"
android:layout_width="@dimen/size_60"
android:layout_height="@dimen/size_35"
android:background="@drawable/shape_rv_dark_gray_circle"
android:ellipsize="end"
android:gravity="center"
android:maxLength="3"
android:singleLine="true"
android:textColor="@color/textGray"
android:textSize="@dimen/text_12" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_item_rv_hot_label3"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1">
<TextView
android:id="@+id/tv_rv_hot_label3"
android:layout_width="@dimen/size_60"
android:layout_height="@dimen/size_35"
android:background="@drawable/shape_rv_dark_gray_circle"
android:ellipsize="end"
android:gravity="center"
android:maxLength="3"
android:singleLine="true"
android:textColor="@color/textGray"
android:textSize="@dimen/text_12" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout>
</LinearLayout>
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_select_car"
android:layout_width="0dp"
android:layout_height="@dimen/size_40"
android:layout_weight="1"
android:background="@drawable/shape_rv_bg_dark_yellow"
android:gravity="center"
android:text="立即选车"
android:textColor="@color/colorWrite"
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"
android:drawableRight="@drawable/common_icon_rig_black"
android:drawablePadding="@dimen/size_2"
android:text="租车指南"
android:textColor="@color/textGray"
android:textSize="@dimen/text_12" />
</LinearLayout>
</LinearLayout>
<!--每周特惠-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/colorWrite"
android:orientation="vertical"
android:paddingTop="@dimen/size_20">
<LinearLayout
android:id="@+id/ll_layout_rv_tour"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="vertical"
android:visibility="gone">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingLeft="@dimen/size_15"
android:paddingRight="@dimen/size_15">
<LinearLayout
android:id="@+id/ll_item_rv_city"
android:layout_width="match_parent"
android:layout_height="@dimen/size_60"
android:layout_marginTop="@dimen/size_10"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_rv_city"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="请选择目的地城市"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_15" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_10"
android:src="@drawable/rv_common_icon_up_arrow" />
</LinearLayout>
<android.support.v7.widget.CardView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:cardElevation="3dp"
app:cardMaxElevation="@dimen/size_10">
<include layout="@layout/common_line" />
<LinearLayout
android:id="@+id/ll_item_hot_rvtour"
android:layout_width="@dimen/size_100"
android:layout_height="@dimen/size_50"
android:background="@drawable/selector_home_item_hot_button"
android:gravity="center"
android:orientation="vertical">
<TextView
android:id="@+id/tv_book_now"
android:layout_width="match_parent"
android:layout_height="@dimen/size_40"
android:layout_marginTop="@dimen/size_20"
android:background="@drawable/shape_rv_bg_dark_yellow"
android:gravity="center"
android:text="立即预订"
android:textColor="@color/colorWrite"
android:textSize="@dimen/text_16" />
<LinearLayout
android:layout_width="match_parent"
android:id="@+id/tv_hot_rvtour"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_20"
android:gravity="center_vertical"
android:orientation="horizontal">
android:text="热门旅行"
android:textColor="@color/textGray"
android:textSize="@dimen/text_14" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="精选房车游路线"
android:textColor="@color/text_Gray"
android:textSize="@dimen/text_10" />
</LinearLayout>
</android.support.v7.widget.CardView>
<TextView
android:layout_width="@dimen/size_50"
android:layout_height="@dimen/size_20"
android:background="@drawable/shape_rv_bg_crimson_xiao_fang"
android:gravity="center"
android:text="热门"
android:textColor="@color/colorWrite"
android:textSize="@dimen/text_10" />
</LinearLayout>
<android.support.v7.widget.CardView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
app:cardElevation="3dp"
app:cardMaxElevation="@dimen/size_10">
<LinearLayout
android:id="@+id/ll_item_rv_hot_label1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1">
<LinearLayout
android:id="@+id/ll_item_hot_entertainment_camp"
android:layout_width="@dimen/size_100"
android:layout_height="@dimen/size_50"
android:layout_centerInParent="true"
android:background="@drawable/selector_home_item_hot_button"
android:gravity="center"
android:orientation="vertical">
<TextView
android:id="@+id/tv_rv_hot_label1"
android:layout_width="@dimen/size_60"
android:layout_height="@dimen/size_35"
android:background="@drawable/shape_rv_dark_gray_circle"
android:ellipsize="end"
android:gravity="center"
android:maxLength="3"
android:singleLine="true"
android:textColor="@color/textGray"
android:textSize="@dimen/text_12" />
</LinearLayout>
<TextView
android:id="@+id/tv_hot_entertainment_camp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="娱乐营地"
android:textColor="@color/textGray"
android:textSize="@dimen/text_14" />
<LinearLayout
android:id="@+id/ll_item_rv_hot_label2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="娱乐休息两不误"
android:textColor="@color/text_Gray"
android:textSize="@dimen/text_10" />
</LinearLayout>
</android.support.v7.widget.CardView>
<TextView
android:id="@+id/tv_rv_hot_label2"
android:layout_width="@dimen/size_60"
android:layout_height="@dimen/size_35"
android:background="@drawable/shape_rv_dark_gray_circle"
android:ellipsize="end"
android:gravity="center"
android:maxLength="3"
android:singleLine="true"
android:textColor="@color/textGray"
android:textSize="@dimen/text_12" />
</LinearLayout>
<android.support.v7.widget.CardView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:cardElevation="3dp"
android:layout_alignParentRight="true"
app:cardMaxElevation="@dimen/size_10">
<LinearLayout
android:id="@+id/ll_item_rv_hot_label3"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1">
<LinearLayout
android:id="@+id/ll_item_hot_car_rental"
android:layout_width="@dimen/size_100"
android:layout_height="@dimen/size_50"
android:layout_alignParentRight="true"
android:background="@drawable/selector_home_item_hot_button"
android:gravity="center"
android:orientation="vertical">
<TextView
android:id="@+id/tv_rv_hot_label3"
android:layout_width="@dimen/size_60"
android:layout_height="@dimen/size_35"
android:background="@drawable/shape_rv_dark_gray_circle"
android:ellipsize="end"
android:gravity="center"
android:maxLength="3"
android:singleLine="true"
android:textColor="@color/textGray"
android:textSize="@dimen/text_12" />
</LinearLayout>
</LinearLayout>
<TextView
android:id="@+id/tv_hot_car_rental"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="优质车型"
android:textColor="@color/textGray"
android:textSize="@dimen/text_14" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="精心打造你的房车"
android:textColor="@color/text_Gray"
android:textSize="@dimen/text_10" />
</LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</RelativeLayout>
</RelativeLayout>
<!--每周特惠-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/colorWrite"
android:orientation="vertical"
android:paddingTop="@dimen/size_20">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingLeft="@dimen/size_15"
android:paddingRight="@dimen/size_15">
<android.support.v7.widget.RecyclerView
android:id="@+id/recyclerView_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/size_10"
android:paddingLeft="@dimen/size_10"
android:paddingRight="@dimen/size_10" />
<LinearLayout
android:id="@+id/ll_item_hot_rvtour"
android:layout_width="@dimen/size_100"
android:layout_height="@dimen/size_50"
android:background="@drawable/shape_rv_border_gray"
<TextView
android:id="@+id/tv_see_more_popular"
android:layout_width="@dimen/size_240"
android:layout_height="@dimen/size_40"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/size_20"
android:background="@drawable/shape_rv_button_gray_circle"
android:gravity="center"
android:orientation="vertical">
<TextView
android:id="@+id/tv_hot_rvtour"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="热门旅行"
android:textColor="@color/textGray"
android:textSize="@dimen/text_14" />
android:text="更多热门旅行线路" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="精选房车游路线"
android:textColor="@color/text_Gray"
android:textSize="@dimen/text_10" />
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_40"
android:paddingLeft="@dimen/size_15"
android:text="精选活动"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_18" />
<LinearLayout
android:id="@+id/ll_item_hot_entertainment_camp"
android:layout_width="@dimen/size_100"
android:layout_height="@dimen/size_50"
android:layout_centerInParent="true"
android:background="@drawable/shape_rv_border_gray"
android:gravity="center"
android:orientation="vertical">
<TextView
android:id="@+id/tv_hot_entertainment_camp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="娱乐营地"
android:textColor="@color/textGray"
android:textSize="@dimen/text_14" />
android:layout_width="match_parent"
android:layout_height="@dimen/size_30"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingLeft="@dimen/size_15"
android:paddingRight="@dimen/size_15">
<TextView
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="娱乐休息两不误"
android:textColor="@color/text_Gray"
android:layout_weight="1"
android:text="小编精选，最好玩的活动都在这里"
android:textSize="@dimen/text_10" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_item_hot_car_rental"
android:layout_width="@dimen/size_100"
android:layout_height="@dimen/size_50"
android:layout_alignParentRight="true"
android:background="@drawable/shape_rv_border_gray"
android:gravity="center"
android:orientation="vertical">
<TextView
android:id="@+id/tv_hot_car_rental"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="优质车型"
android:textColor="@color/textGray"
android:textSize="@dimen/text_14" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="精心打造你的房车"
android:textColor="@color/text_Gray"
android:drawableRight="@drawable/common_icon_rig_black"
android:drawablePadding="@dimen/size_5"
android:text="全部"
android:textSize="@dimen/text_10" />
</LinearLayout>
</RelativeLayout>
<android.support.v7.widget.RecyclerView
android:id="@+id/recyclerView_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/size_10"
android:paddingLeft="@dimen/size_10"
android:paddingRight="@dimen/size_10" />
<TextView
android:id="@+id/tv_see_more_popular"
android:layout_width="@dimen/size_240"
android:layout_height="@dimen/size_40"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/size_20"
android:background="@drawable/shape_rv_button_gray"
android:gravity="center"
android:text="更多热门旅行线路" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_40"
android:paddingLeft="@dimen/size_15"
android:text="精选活动"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_18" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/size_30"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingLeft="@dimen/size_15"
android:paddingRight="@dimen/size_15">
<android.support.v7.widget.RecyclerView
android:id="@+id/recyclerView_activity"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/size_15"
android:paddingRight="@dimen/size_15" />
<TextView
android:layout_width="0dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="小编精选，最好玩的活动都在这里"
android:textSize="@dimen/text_10" />
android:layout_marginTop="@dimen/size_30"
android:paddingLeft="@dimen/size_15"
android:paddingRight="@dimen/size_15"
android:text="房车游榜单"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_18" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableRight="@drawable/common_icon_rig_black"
android:drawablePadding="@dimen/size_5"
android:text="全部"
android:layout_marginTop="@dimen/size_5"
android:paddingLeft="@dimen/size_15"
android:paddingRight="@dimen/size_15"
android:text="精选优质旅游路线，满足你的出行需求"
android:textSize="@dimen/text_10" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="@dimen/size_200"
android:orientation="vertical"
android:paddingLeft="@dimen/size_15"
android:paddingRight="@dimen/size_15">
<android.support.v7.widget.RecyclerView
android:id="@+id/recyclerView_rvtourlist"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<android.support.v7.widget.RecyclerView
android:id="@+id/recyclerView_rvtourlist_title"
android:layout_width="match_parent"
android:layout_height="@dimen/size_100"
android:layout_alignParentBottom="true"
android:layout_marginBottom="@dimen/size_5" />
</RelativeLayout>
</LinearLayout>
<android.support.v7.widget.RecyclerView
android:id="@+id/recyclerView_activity"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
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_30"
android:paddingLeft="@dimen/size_15"
android:paddingRight="@dimen/size_15"
android:text="房车游榜单"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_18" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_5"
android:paddingLeft="@dimen/size_15"
android:paddingRight="@dimen/size_15"
android:text="精选优质旅游路线，满足你的出行需求"
android:textSize="@dimen/text_10" />
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="@dimen/size_200"
android:orientation="vertical"
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_30"
android:paddingLeft="@dimen/size_15"
android:paddingRight="@dimen/size_15"
android:text="房车发烧友"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_18" />
<android.support.v7.widget.RecyclerView
android:id="@+id/recyclerView_rvtourlist"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_5"
android:paddingLeft="@dimen/size_15"
android:paddingRight="@dimen/size_15"
android:text="分享精彩时刻"
android:textSize="@dimen/text_10" />
<android.support.v7.widget.RecyclerView
android:id="@+id/recyclerView_rvtourlist_title"
android:id="@+id/recyclerView_rv_enthusiast"
android:layout_width="match_parent"
android:layout_height="@dimen/size_100"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginBottom="@dimen/size_5" />
</RelativeLayout>
</LinearLayout>
android:paddingLeft="@dimen/size_8"
android:paddingRight="@dimen/size_8" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_30"
android:paddingLeft="@dimen/size_15"
android:paddingRight="@dimen/size_15"
android:text="房车发烧友"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_18" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_5"
android:paddingLeft="@dimen/size_15"
android:paddingRight="@dimen/size_15"
android:text="分享精彩时刻"
android:textSize="@dimen/text_10" />
<android.support.v7.widget.RecyclerView
android:id="@+id/recyclerView_rv_enthusiast"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:paddingLeft="@dimen/size_8"
android:paddingRight="@dimen/size_8" />
</LinearLayout>
</LinearLayout>
</com.rv.component.utils.ObservableScrollView>
</com.rv.component.utils.ObservableScrollView>
</com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout>
<LinearLayout
android:id="@+id/ll_item_title"
......@@ -786,9 +837,9 @@
android:id="@+id/travel_server_image"
android:layout_width="@dimen/size_30"
android:layout_height="@dimen/size_30"
android:paddingRight="@dimen/ui_dimen_common"
android:layout_marginRight="@dimen/size_5"
android:padding="@dimen/size_5"
android:paddingRight="@dimen/ui_dimen_common"
android:scaleType="centerInside"
android:src="@drawable/rv_rentingcar_icon_service_white" />
......@@ -796,22 +847,23 @@
android:id="@+id/ll_item_top"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="@dimen/size_15"
android:gravity="center_horizontal"
android:visibility="gone"
android:orientation="vertical">
android:orientation="vertical"
android:paddingRight="@dimen/size_15"
android:visibility="gone">
<ImageView
android:layout_width="@dimen/size_20"
android:layout_height="@dimen/size_20"
android:padding="@dimen/size_2"
android:src="@drawable/common_icon_stick"/>
android:src="@drawable/common_icon_stick" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="回顶部"
android:textColor="@color/gray_FFB74B"
android:textSize="@dimen/text_8"
android:text="回顶部"/>
android:textSize="@dimen/text_8" />
</LinearLayout>
</LinearLayout>
......
module_home/src/main/res/layout/rv_act_confim_order.xml
View file @ f5a303ef
......@@ -410,6 +410,7 @@
android:padding="@dimen/size_15">
<TextView
android:id="@+id/tv_deposit_hint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableRight="@drawable/rv_common_icon_notice"
......@@ -454,6 +455,7 @@
android:textSize="@dimen/text_16" />
<TextView
android:id="@+id/tv_privilege_service_hint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
......@@ -746,6 +748,7 @@
android:textSize="@dimen/text_16" />
<TextView
android:id="@+id/tv_booking_instructions_hint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
......
module_home/src/main/res/layout/rv_item_hot_car_type.xml
View file @ f5a303ef
......@@ -22,7 +22,6 @@
android:layout_marginTop="@dimen/size_10"
android:ellipsize="end"
android:maxLines="1"
android:text="大通自行式C型房车（旅居版）"
android:textColor="@color/textMain"
android:textSize="@dimen/text_16" />
......@@ -33,7 +32,6 @@
android:layout_marginTop="@dimen/size_3"
android:ellipsize="end"
android:maxLines="1"
android:text="烧烤·麻将·微波炉"
android:textColor="@color/textGray"
android:textSize="@dimen/text_12" />
......
module_home/src/main/res/values/strings.xml
View file @ f5a303ef
......@@ -116,7 +116,7 @@
<string name="rv_delete">删除</string>
<string name="rv_driving_data_null">您还没有驾驶员哦</string>
<string name="rv_car_type_data_null">未找到筛选数据</string>
<string name="rv_day_toast">租车天数必须大于1</string>
<string name="rv_day_toast">租车天数必须大于等于1</string>
<string name="rv_driving_info">驾驶人信息</string>
<string name="rv_rb">元</string>
<string name="rv_id_card">身份证号</string>
......
module_home/src/main/res/values/styles.xml
View file @ f5a303ef
......@@ -67,7 +67,7 @@
<!-- 给Theme设置backgroud,解决启动黑屏问题，不过这样的启动速度好像变得更慢了一些-->
<style name="SplashTheme" parent="Theme.AppCompat.Light.NoActionBar">
<item name="android:windowBackground">@drawable/live_backgroud3</item>
<item name="android:windowBackground">@drawable/start_backgroud</item>
<item name="windowNoTitle">true</item>
<item name="windowActionBar">false</item>
<item name="android:windowContentOverlay">@null</item>
......
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