旅游订单列表和订单详情

RvHome/src/main/AndroidManifest.xml

-<manifest package="com.rv.home" />
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.rv.home">
+
+</manifest>
\ No newline at end of file

RvHome/src/main/java/com/rv/home/rv/module/ApiConfig.java

@@ -40,6 +40,8 @@ public class ApiConfig {
     public static String HTTP_URL_CAR_TYPE_DETAIL = RvFrameConfig.HOST + "/h5/appHtml/view/detail.html";//租车类型详情页
     public static String HTTP_URL_CAR_TYPE_ORDERDETAIL = RvFrameConfig.HOST + "/h5/appHtml/view/orderDetail.html";//订单详情页
     public static String HTTP_URL_BASEORDER_CANCEL = RvFrameConfig.VEHICLE_ORDER + "baseOrder/cancel/";//重置密码
+    public static String HTTP_URL_CAR_TYPE_TRAVELORDERDETAIL = RvFrameConfig.HOST + "/h5/appHtml/view/travelOrderDetail.html";//旅游订单详情页
+    public static String HTTP_URL_CAR_TYPE_COSTDETAIL= RvFrameConfig.HOST+"/h5/appHtml/view/costDetail.html";//费用明细
 
 
 }

RvHome/src/main/java/com/rv/home/rv/module/basic/WebActivity.java

@@ -7,15 +7,14 @@ import android.os.Bundle;
 import android.widget.LinearLayout;
 
 import com.ruiwenliu.wrapper.base.BaseBean;
-import com.ruiwenliu.wrapper.presenter.MvpPresenter;
 import com.ruiwenliu.wrapper.weight.TitleView;
 import com.ruiwenliu.wrapper.weight.webview.SafeWebView;
 import com.rv.home.R;
+import com.rv.home.rv.module.basic.presenter.PickerPresenter;
 import com.rv.home.R2;
-
 import butterknife.BindView;
 
-public class WebActivity extends BaseStatusActivity<MvpPresenter> {
+public class WebActivity extends BaseStatusActivity<PickerPresenter> {
 
     @BindView(R2.id.webView)
     SafeWebView mWebView;

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

@@ -5,6 +5,7 @@ import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.util.Log;
 import android.view.View;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
@@ -70,10 +71,13 @@ public class ForPaymentFragment extends BaseFragment<CommonPresenter> implements
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                 OrderListBean.DataBeanX.DataBean dataBean = (OrderListBean.DataBeanX.DataBean) adapter.getItem(position);
-                startActivityForResult(OrderDetailActivity.getIntent(_mActivity,dataBean.getNo(),dataBean.getStatusX()),1);
+                if (1 ==dataBean.getType()) {
+                    startActivityForResult(OrderDetailActivity.getIntent(_mActivity, dataBean.getNo(), dataBean.getStatusX()), 1);
+                }else if (2== dataBean.getType()){
+                    startActivityForResult(TravelOrderDetailsActivity.getIntent(_mActivity, dataBean.getNo(), dataBean.getStatusX()), 2);
+                }
             }
         });
-
     }
 
     @Override

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

 package com.rv.home.rv.module.ui.main.home.order;
 
+import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
@@ -19,6 +20,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.BaseStatusActivity;
+import com.rv.home.rv.module.basic.WebActivity;
 import com.rv.home.rv.module.basic.presenter.PickerPresenter;
 import com.yuyife.okgo.OkGoUtil;
 
@@ -233,5 +235,18 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
         public String getToken() {
             return OkGoUtil.getToken();
         }
+
+        @JavascriptInterface
+        public ClipboardManager getCopy(){
+            ClipboardManager clip = (ClipboardManager)mActivity.getSystemService(Context.CLIPBOARD_SERVICE);
+            clip.setText(no);
+            showToast("复制成功！");
+            return  clip;
+        }
+
+        @JavascriptInterface
+        public void onClick(){
+            startActivity(WebActivity.getIntent(mActivity, mActivity.getString(R.string.rv_charge_details), ApiConfig.HTTP_URL_CAR_TYPE_COSTDETAIL));
+        }
     }
 }

RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/TravelOrderDetailsActivity.java

 package com.rv.home.rv.module.ui.main.home.order;
 
-import android.support.v7.app.AppCompatActivity;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Build;
 import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.webkit.JavascriptInterface;
+import android.webkit.WebChromeClient;
+import android.webkit.WebResourceRequest;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+import com.rv.home.R2;
+import com.ruiwenliu.wrapper.base.BaseBean;
+import com.ruiwenliu.wrapper.base.BaseStatusActivity;
+import com.ruiwenliu.wrapper.weight.TitleView;
+import com.rv.home.R;
+import com.rv.home.rv.module.ApiConfig;
+import com.rv.home.rv.module.basic.presenter.PickerPresenter;
+import com.yuyife.okgo.OkGoUtil;
 
-public class TravelOrderDetailsActivity extends AppCompatActivity {
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
+import static com.ruiwenliu.wrapper.weight.webview.SafeWebView.hasKitkat;
+
+/**
+ * 旅游详情页面
+ */
+public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresenter> {
+
+
+    @BindView(R2.id.webView)
+    WebView mWebView;
+
+    private String webUrl;
+    private int type;
+    private String no;
+
+
+    public static Intent getIntent(Context context, String orderId, int type) {
+        return new Intent(context, TravelOrderDetailsActivity.class)
+                .putExtra("no", orderId)
+                .putExtra("type", type);
+    }
+
+    @Override
+    protected int setLayout() {
+        return R.layout.activity_travel_order_details;
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mWebView.onResume();// 生命周期onResume
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        mWebView.onPause();//生命周期onPause
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        mWebView.stopLoading();// 停止当前加载
+        mWebView.clearMatches();// 清除网页查找的高亮匹配字符。
+        mWebView.clearHistory();// 清除当前 WebView 访问的历史记录
+        mWebView.clearSslPreferences();//清除ssl信息
+        mWebView.clearCache(true);//清空网页访问留下的缓存数据。需要注意的时，由于缓存是全局的，所以只要是WebView用到的缓存都会被清空，即便其他地方也会使用到。该方法接受一个参数，从命名即可看出作用。若设为false，则只清空内存里的资源缓存，而不清空磁盘里的。
+        mWebView.loadUrl("about:blank");// 清空当前加载
+        mWebView.removeAllViews();// 清空子 View
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR2) {
+            mWebView.removeJavascriptInterface("AndroidNative");// 向 Web端注入 java 对象
+        }
+//        mWebView.addJavascriptInterface(new AndroidJs(),"AndroidJs");
+        mWebView.destroy();// 生命周期销毁
+
+    }
+
+
+    @Override
+    protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
+        showTitle(false);
+        type = intent.getIntExtra("type", 0);
+        no = intent.getStringExtra("no");
+        switch (type) {
+            case 3:
+                break;
+            case 4:
+                break;
+            case 5:
+                break;
+            case 6:
+                break;
+        }
+
+
+        webUrl = ApiConfig.HTTP_URL_CAR_TYPE_TRAVELORDERDETAIL + "?no=" + no;
+        Log.i("travelorderdetailsactivi", "initView: " +webUrl);
+        initWeb();
+    }
+
+    @Override
+    public void onShowResult(int requestType, BaseBean result) {
+
+    }
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_travel_order_details);
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == 1 && resultCode == RESULT_OK) {
+            setResult(RESULT_OK);
+            finish();
+        }
+    }
+
+//    @OnClick({R2.id.iv_back, R2.id.iv_customer_service, R2.id.tv_cancel_order, R2.id.tv_pick_up_the_car})
+//    public void onViewClicked(View view) {
+//        int i = view.getId();
+//        if (i == R.id.iv_back) {
+//            finish();
+//
+//        } else if (i == R.id.iv_customer_service) {
+//        } else if (i == R.id.tv_cancel_order) {
+//            cancelOnclick();
+//
+//        } else if (i == R.id.tv_pick_up_the_car) {
+//        }
+//    }
+
+    private void cancelOnclick() {
+        switch (type) {
+            case 3:
+            case 4:
+                startActivityForResult(CancelTheTripActivity.getIntent(mActivity, no), 1);
+                break;
+            case 5:
+                break;
+            case 6:
+                break;
+        }
     }
+
+
+    private void initWeb() {
+        WebSettings webSettings = mWebView.getSettings();
+        if (webSettings == null) return;
+        // 支持 Js 使用
+        webSettings.setJavaScriptEnabled(true);
+        // 开启DOM缓存,默认状态下是不支持LocalStorage的
+        webSettings.setDomStorageEnabled(true);
+        // 开启数据库缓存
+        webSettings.setDatabaseEnabled(true);
+        // 支持自动加载图片
+        webSettings.setLoadsImagesAutomatically(hasKitkat());
+        // 设置 WebView 的缓存模式
+        webSettings.setCacheMode(WebSettings.LOAD_DEFAULT);
+        // 支持启用缓存模式
+        webSettings.setAppCacheEnabled(true);
+        // 设置 AppCache 最大缓存值(现在官方已经不提倡使用，已废弃)
+//        webSettings.setAppCacheMaxSize(8 * 1024 * 1024);
+        // Android 私有缓存存储，如果你不调用setAppCachePath方法，WebView将不会产生这个目录
+        webSettings.setAppCachePath(getCacheDir().getAbsolutePath());
+        // 数据库路径
+//        if (!hasKitkat()) {
+//            webSettings.setDatabasePath(getDatabasePath("html").getPath());
+//        }
+        // 关闭密码保存提醒功能
+//        webSettings.setSavePassword(false);
+        // 支持缩放
+        webSettings.setSupportZoom(true);
+        // 设置 UserAgent 属性
+        webSettings.setUserAgentString("");
+        // 允许加载本地 html 文件/false
+        webSettings.setAllowFileAccess(true);
+        // 允许通过 file url 加载的 Javascript 读取其他的本地文件,Android 4.1 之前默认是true，在 Android 4.1 及以后默认是false,也就是禁止
+        webSettings.setAllowFileAccessFromFileURLs(true);
+        // 允许通过 file url 加载的 Javascript 可以访问其他的源，包括其他的文件和 http，https 等其他的源，
+        // Android 4.1 之前默认是true，在 Android 4.1 及以后默认是false,也就是禁止
+        // 如果此设置是允许，则 setAllowFileAccessFromFileURLs 不起做用
+        webSettings.setAllowUniversalAccessFromFileURLs(true);
+        mWebView.addJavascriptInterface(new AndroidJs(), "AndroidJs");
+        mWebView.loadUrl(webUrl);
+        mWebView.setWebViewClient(new WebViewClient() {
+            @Override
+            public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
+                return super.shouldOverrideUrlLoading(view, request);
+            }
+        });
+        mWebView.setWebChromeClient(new WebChromeClient() {
+            @Override
+            public void onProgressChanged(WebView view, int newProgress) {
+                super.onProgressChanged(view, newProgress);
+                if (newProgress == 85) {
+                    onHideLoading();
+                }
+            }
+        });
+    }
+
+    public class AndroidJs {
+        @JavascriptInterface
+        public String getToken() {
+            return OkGoUtil.getToken();
+        }
+
+        @JavascriptInterface
+        public ClipboardManager getCopy(){
+            ClipboardManager clip = (ClipboardManager)mActivity.getSystemService(Context.CLIPBOARD_SERVICE);
+            clip.setText(no);
+            showToast("复制成功！");
+            return  clip;
+        }
+    }
+
 }

RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/adapter/CompletedAdapter.java

@@ -21,8 +21,8 @@ import java.util.List;
  */
 
 public class CompletedAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity, BaseGlideHolder> {
-    public static final int TYPE_FOR_PAYMENT = 0;
-    public static final int TYPE_TO_TRAVEL = 1;
+    public static final int TYPE_FOR_PAYMENT = 1;
+    public static final int TYPE_TO_TRAVEL = 2;
 
     public CompletedAdapter(List<MultiItemEntity> data) {
         super(data);
@@ -35,33 +35,45 @@ public class CompletedAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
         switch (helper.getItemViewType()) {
             case TYPE_FOR_PAYMENT:
                 OrderListBean.DataBeanX.DataBean dataBean = (OrderListBean.DataBeanX.DataBean) item;
+                if (dataBean ==null){
+                    return;
+                }
                 helper.setText(R.id.tv_order_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_order_time), dataBean.getCrtTime()));
-                helper.setText(R.id.tv_city, dataBean.getDetail().getStart_city_name());
+                if (dataBean.getOrderRentVehicleDetail() !=null && dataBean.getOrderRentVehicleDetail().getStart_city_name()!=null) {
+                    helper.setText(R.id.tv_city, dataBean.getOrderRentVehicleDetail().getStart_city_name());
+                }
                 helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_completed));
                 helper.loadRoundImage(mContext, dataBean.getPicture(), (ImageView) helper.getView(R.id.iv_goods), 10);
                 helper.setText(R.id.tv_car_type, dataBean.getName());
-                helper.setText(R.id.tv_get_time, TimeManager.stampToDate(String.valueOf(dataBean.getDetail().getStart_time())));
-                helper.setText(R.id.tv_get_address, dataBean.getDetail().getStart_addr());
-                helper.setText(R.id.tv_out_time, TimeManager.stampToDate(String.valueOf(dataBean.getDetail().getEnd_time())));
-                helper.setText(R.id.tv_out_address, dataBean.getDetail().getEnd_addr());
+                if (dataBean.getOrderRentVehicleDetail() !=null) {
+                    helper.setText(R.id.tv_get_time, TimeManager.stampToDate(String.valueOf(dataBean.getOrderRentVehicleDetail().getStart_time())));
+                    helper.setText(R.id.tv_get_address, dataBean.getOrderRentVehicleDetail().getStart_addr());
+                    helper.setText(R.id.tv_out_time, TimeManager.stampToDate(String.valueOf(dataBean.getOrderRentVehicleDetail().getEnd_time())));
+                    helper.setText(R.id.tv_out_address, dataBean.getOrderRentVehicleDetail().getEnd_addr());
+                }
                 helper.setText(R.id.tv_price, String.format("￥%1$s", dataBean.getOrderAmount()));
                 helper.setText(R.id.tv_process, mContext.getString(R.string.rv_to_evaluation));
                 helper.addOnClickListener(R.id.tv_process);
                 break;
             case TYPE_TO_TRAVEL:
-                ToTravelBean toTravelBean = (ToTravelBean) item;
-                helper.setText(R.id.tv_order_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_order_time), "2019-8-12"));
+                OrderListBean.DataBeanX.DataBean dataBean2 = (OrderListBean.DataBeanX.DataBean) item;
+                if (dataBean2 == null) {
+                    return;
+                }
+                if (dataBean2.getOrderTourDetail() ==null ){
+                    return;
+                }
+                helper.setText(R.id.tv_order_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_order_time), dataBean2.getCrtTime()));
                 helper.setText(R.id.tv_city, "东莞市");
                 helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_for_payment));
-                String urls = "https://gss1.bdstatic.com/-vo3dSag_xI4khGkpoWK1HF6hhy/baike/c0%3Dbaike180%2C5%2C5%2C180%2C60/sign=fc8e9183fd03738dca470470d272db34/10dfa9ec8a136327275f2c109a8fa0ec08fac767.jpg";
-                helper.loadRoundImage(mContext, urls, (ImageView) helper.getView(R.id.iv_goods), 50);
-                helper.setText(R.id.tv_car_type, "奔驰最新款霸道房车");
-                helper.setText(R.id.tv_out_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_to_time), "2019-7-4"));
+                helper.loadRoundImage(mContext, dataBean2.getPicture(), (ImageView) helper.getView(R.id.iv_goods), 50);
+                helper.setText(R.id.tv_car_type, dataBean2.getName());
+                helper.setText(R.id.tv_out_time, mContext.getString(R.string.rv_to_time) +TimeManager.stampToDate(String.valueOf( dataBean2.getOrderTourDetail().getStartTime())));
                 helper.setText(R.id.tv_count_person, String.format("%1$s%2$s%2$s", mContext.getString(R.string.rv_to_time), "6", mContext.getString(R.string.rv_person)));
                 helper.setText(R.id.tv_price, String.format("￥%1$s", "3200000"));
-                helper.setText(R.id.tv_camp_process, toTravelBean.name);
+                helper.setText(R.id.tv_camp_process, mContext.getString(R.string.rv_to_pay_for));
                 helper.addOnClickListener(R.id.tv_camp_process);
-                helper.setGone(R.id.tv_camp_process, TextUtils.isEmpty(toTravelBean.name) ? false : true);
+                helper.setGone(R.id.tv_camp_process, TextUtils.isEmpty(dataBean2.getName()) ? false : true);
                 break;
         }
     }

RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/adapter/ForPaymentAdapter.java

@@ -9,10 +9,7 @@ import com.ruiwenliu.wrapper.util.BaseGlideHolder;
 import com.ruiwenliu.wrapper.util.TimeManager;
 import com.rv.home.R;
 import com.rv.home.R2;
-import com.rv.home.rv.module.ui.main.home.order.bean.ForPaymentBean;
 import com.rv.home.rv.module.ui.main.home.order.bean.OrderListBean;
-import com.rv.home.rv.module.ui.main.home.order.bean.ToTravelBean;
-
 import java.util.List;
 
 /**
@@ -21,9 +18,9 @@ import java.util.List;
  * Desc:待付款
  */
 
-public class ForPaymentAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,BaseGlideHolder> {
-    public static final int TYPE_FOR_PAYMENT=0;
-    public static final int TYPE_TO_TRAVEL=1;
+public class ForPaymentAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity, BaseGlideHolder> {
+    public static final int TYPE_FOR_PAYMENT = 1;   //1--租车；2--旅游
+    public static final int TYPE_TO_TRAVEL = 2;
 
     public ForPaymentAdapter(List<MultiItemEntity> data) {
         super(data);
@@ -33,41 +30,53 @@ public class ForPaymentAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity
 
     @Override
     protected void convert(BaseGlideHolder helper, MultiItemEntity item) {
-        switch (helper.getItemViewType()){
+        switch (helper.getItemViewType()) {
             case TYPE_FOR_PAYMENT:
-                OrderListBean.DataBeanX.DataBean dataBean= (OrderListBean.DataBeanX.DataBean) item;
-                helper.setText(R.id.tv_order_time,String.format("%1$s%2$s",mContext.getString(R.string.rv_order_time),dataBean.getCrtTime()));
-                helper.setText(R.id.tv_city,dataBean.getDetail().getStart_city_name());
-                helper.setText(R.id.tv_order_state,mContext.getString(R.string.rv_order_for_payment));
-                helper.loadRoundImage(mContext,dataBean.getPicture(), (ImageView) helper.getView(R.id.iv_goods),10);
-                helper.setText(R.id.tv_car_type,dataBean.getName());
-                helper.setText(R.id.tv_get_time, TimeManager.stampToDate(String.valueOf(dataBean.getDetail().getStart_time())));
-                helper.setText(R.id.tv_get_address,dataBean.getDetail().getStart_addr());
-                helper.setText(R.id.tv_out_time, TimeManager.stampToDate(String.valueOf(dataBean.getDetail().getEnd_time())));
-                helper.setText(R.id.tv_out_address,dataBean.getDetail().getEnd_addr());
-                helper.setText(R.id.tv_price,String.format("￥%1$s",dataBean.getOrderAmount()));
-                helper.setText(R.id.tv_process,mContext.getString(R.string.rv_to_pay_for));
+                OrderListBean.DataBeanX.DataBean dataBean = (OrderListBean.DataBeanX.DataBean) item;
+                if (dataBean == null) {
+                    return;
+                }
+                helper.setText(R.id.tv_order_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_order_time), dataBean.getCrtTime()));
+                if (dataBean.getOrderRentVehicleDetail() != null && dataBean.getOrderRentVehicleDetail().getStart_city_name() != null) {
+                    helper.setText(R.id.tv_city, dataBean.getOrderRentVehicleDetail().getStart_city_name());
+                }
+                helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_for_payment));
+                helper.loadRoundImage(mContext, dataBean.getPicture(), (ImageView) helper.getView(R.id.iv_goods), 10);
+                helper.setText(R.id.tv_car_type, dataBean.getName());
+                if (dataBean.getOrderRentVehicleDetail() != null) {
+                    helper.setText(R.id.tv_get_time, TimeManager.stampToDate(String.valueOf(dataBean.getOrderRentVehicleDetail().getStart_time())));
+                    helper.setText(R.id.tv_get_address, dataBean.getOrderRentVehicleDetail().getStart_addr());
+                    helper.setText(R.id.tv_out_time, TimeManager.stampToDate(String.valueOf(dataBean.getOrderRentVehicleDetail().getEnd_time())));
+                    helper.setText(R.id.tv_out_address, dataBean.getOrderRentVehicleDetail().getEnd_addr());
+                    helper.setText(R.id.tv_price, String.format("￥%1$s", dataBean.getOrderAmount()));
+                }
+                helper.setText(R.id.tv_process, mContext.getString(R.string.rv_to_pay_for));
                 helper.addOnClickListener(R.id.tv_process);
                 break;
             case TYPE_TO_TRAVEL:
-                ToTravelBean toTravelBean= (ToTravelBean) item;
-                helper.setText(R.id.tv_order_time,String.format("%1$s%2$s",mContext.getString(R.string.rv_order_time),"2019-8-12"));
-                helper.setText(R.id.tv_city,"东莞市");
-                helper.setText(R.id.tv_order_state,mContext.getString(R.string.rv_order_for_payment));
-                String urls="https://gss1.bdstatic.com/-vo3dSag_xI4khGkpoWK1HF6hhy/baike/c0%3Dbaike180%2C5%2C5%2C180%2C60/sign=fc8e9183fd03738dca470470d272db34/10dfa9ec8a136327275f2c109a8fa0ec08fac767.jpg";
-                helper.loadRoundImage(mContext,urls, (ImageView) helper.getView(R.id.iv_goods),50);
-                helper.setText(R.id.tv_car_type,"奔驰最新款霸道房车");
-                helper.setText(R.id.tv_out_time,String.format("%1$s%2$s",mContext.getString(R.string.rv_to_time),"2019-7-4"));
-                helper.setText(R.id.tv_count_person,String.format("%1$s%2$s%2$s",mContext.getString(R.string.rv_to_time),"6",mContext.getString(R.string.rv_person)));
-                helper.setText(R.id.tv_price,String.format("￥%1$s","3200000"));
-                helper.setText(R.id.tv_camp_process,toTravelBean.name);
+                OrderListBean.DataBeanX.DataBean dataBean2 = (OrderListBean.DataBeanX.DataBean) item;
+                if (dataBean2 == null) {
+                    return;
+                }
+                if (dataBean2.getOrderTourDetail() ==null ){
+                    return;
+                }
+                helper.setText(R.id.tv_order_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_order_time), dataBean2.getCrtTime()));
+                helper.setText(R.id.tv_city, "东莞市");
+                helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_for_payment));
+                helper.loadRoundImage(mContext, dataBean2.getPicture(), (ImageView) helper.getView(R.id.iv_goods), 50);
+                helper.setText(R.id.tv_car_type, dataBean2.getName());
+                helper.setText(R.id.tv_out_time, mContext.getString(R.string.rv_to_time) +TimeManager.stampToDate(String.valueOf( dataBean2.getOrderTourDetail().getStartTime())));
+                helper.setText(R.id.tv_count_person, String.format("%1$s%2$s%2$s", mContext.getString(R.string.rv_to_time), "6", mContext.getString(R.string.rv_person)));
+                helper.setText(R.id.tv_price, String.format("￥%1$s", dataBean2.getOrderAmount()));
+                helper.setText(R.id.tv_camp_process, mContext.getString(R.string.rv_to_pay_for));
                 helper.addOnClickListener(R.id.tv_camp_process);
-                helper.setGone(R.id.tv_camp_process, TextUtils.isEmpty(toTravelBean.name)?false:true);
+                helper.setGone(R.id.tv_camp_process, TextUtils.isEmpty(dataBean2.getName()) ? false : true);
                 break;
         }
     }
 
-    public void addNewData(OrderListBean bean){
+    public void addNewData(OrderListBean bean) {
         mData.clear();
         addData(bean.getData().getData());
         notifyDataSetChanged();

RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/adapter/HaveToTravelAdapter.java

@@ -21,8 +21,8 @@ import java.util.List;
  */
 
 public class HaveToTravelAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,BaseGlideHolder> {
-    public static final int TYPE_FOR_PAYMENT=0;
-    public static final int TYPE_TO_TRAVEL=1;
+    public static final int TYPE_FOR_PAYMENT=1;
+    public static final int TYPE_TO_TRAVEL=2;
 
     public HaveToTravelAdapter(List<MultiItemEntity> data) {
         super(data);
@@ -35,33 +35,45 @@ public class HaveToTravelAdapter extends BaseMultiItemQuickAdapter<MultiItemEnti
         switch (helper.getItemViewType()){
             case TYPE_FOR_PAYMENT:
                 OrderListBean.DataBeanX.DataBean dataBean= (OrderListBean.DataBeanX.DataBean) item;
+                if (dataBean ==null){
+                    return;
+                }
                 helper.setText(R.id.tv_order_time,String.format("%1$s%2$s",mContext.getString(R.string.rv_order_time),dataBean.getCrtTime()));
-                helper.setText(R.id.tv_city,dataBean.getDetail().getStart_city_name());
+                if (dataBean.getOrderRentVehicleDetail() !=null && dataBean.getOrderRentVehicleDetail().getStart_city_name()!=null) {
+                    helper.setText(R.id.tv_city, dataBean.getOrderRentVehicleDetail().getStart_city_name());
+                }
                 helper.setText(R.id.tv_order_state,mContext.getString(R.string.rv_order_have_travel));
                 helper.loadRoundImage(mContext,dataBean.getPicture(), (ImageView) helper.getView(R.id.iv_goods),10);
                 helper.setText(R.id.tv_car_type,dataBean.getName());
-                helper.setText(R.id.tv_get_time, TimeManager.stampToDate(String.valueOf(dataBean.getDetail().getStart_time())));
-                helper.setText(R.id.tv_get_address,dataBean.getDetail().getStart_addr());
-                helper.setText(R.id.tv_out_time, TimeManager.stampToDate(String.valueOf(dataBean.getDetail().getEnd_time())));
-                helper.setText(R.id.tv_out_address,dataBean.getDetail().getEnd_addr());
+                if (dataBean.getOrderRentVehicleDetail() !=null) {
+                    helper.setText(R.id.tv_get_time, TimeManager.stampToDate(String.valueOf(dataBean.getOrderRentVehicleDetail().getStart_time())));
+                    helper.setText(R.id.tv_get_address, dataBean.getOrderRentVehicleDetail().getStart_addr());
+                    helper.setText(R.id.tv_out_time, TimeManager.stampToDate(String.valueOf(dataBean.getOrderRentVehicleDetail().getEnd_time())));
+                    helper.setText(R.id.tv_out_address, dataBean.getOrderRentVehicleDetail().getEnd_addr());
+                }
                 helper.setText(R.id.tv_price,String.format("￥%1$s",dataBean.getOrderAmount()));
                 helper.setText(R.id.tv_process,mContext.getString(R.string.rv_to_out_car));
                 helper.addOnClickListener(R.id.tv_process);
                 break;
             case TYPE_TO_TRAVEL:
-                ToTravelBean toTravelBean= (ToTravelBean) item;
-                helper.setText(R.id.tv_order_time,String.format("%1$s%2$s",mContext.getString(R.string.rv_order_time),"2019-8-12"));
-                helper.setText(R.id.tv_city,"东莞市");
+                OrderListBean.DataBeanX.DataBean dataBean2 = (OrderListBean.DataBeanX.DataBean) item;
+                if (dataBean2 == null) {
+                    return;
+                }
+                if (dataBean2.getOrderTourDetail() ==null ){
+                    return;
+                }
+                helper.setText(R.id.tv_order_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_order_time), dataBean2.getCrtTime()));
+                helper.setText(R.id.tv_city, "东莞市");
                 helper.setText(R.id.tv_order_state,mContext.getString(R.string.rv_order_for_payment));
-                String urls="https://gss1.bdstatic.com/-vo3dSag_xI4khGkpoWK1HF6hhy/baike/c0%3Dbaike180%2C5%2C5%2C180%2C60/sign=fc8e9183fd03738dca470470d272db34/10dfa9ec8a136327275f2c109a8fa0ec08fac767.jpg";
-                helper.loadRoundImage(mContext,urls, (ImageView) helper.getView(R.id.iv_goods),50);
-                helper.setText(R.id.tv_car_type,"奔驰最新款霸道房车");
-                helper.setText(R.id.tv_out_time,String.format("%1$s%2$s",mContext.getString(R.string.rv_to_time),"2019-7-4"));
+                helper.loadRoundImage(mContext,dataBean2.getPicture(), (ImageView) helper.getView(R.id.iv_goods),50);
+                helper.setText(R.id.tv_car_type,dataBean2.getName());
+                helper.setText(R.id.tv_out_time, mContext.getString(R.string.rv_to_time) +TimeManager.stampToDate(String.valueOf( dataBean2.getOrderTourDetail().getStartTime())));
                 helper.setText(R.id.tv_count_person,String.format("%1$s%2$s%2$s",mContext.getString(R.string.rv_to_time),"6",mContext.getString(R.string.rv_person)));
-                helper.setText(R.id.tv_price,String.format("￥%1$s","3200000"));
-                helper.setText(R.id.tv_camp_process,toTravelBean.name);
+                helper.setText(R.id.tv_price, String.format("￥%1$s", dataBean2.getOrderAmount()));
+                helper.setText(R.id.tv_camp_process, mContext.getString(R.string.rv_to_pay_for));
                 helper.addOnClickListener(R.id.tv_camp_process);
-                helper.setGone(R.id.tv_camp_process, TextUtils.isEmpty(toTravelBean.name)?false:true);
+                helper.setGone(R.id.tv_camp_process, TextUtils.isEmpty(mContext.getString(R.string.rv_to_pay_for))?false:true);
                 break;
         }
     }

RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/adapter/OrderListAdapter.java

@@ -22,8 +22,8 @@ import java.util.List;
  */
 
 public class OrderListAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity, BaseGlideHolder> {
-    public static final int TYPE_FOR_PAYMENT = 0;
-    public static final int TYPE_TO_TRAVEL = 1;
+    public static final int TYPE_FOR_PAYMENT = 1;
+    public static final int TYPE_TO_TRAVEL = 2;
 
     public OrderListAdapter(List<MultiItemEntity> data) {
         super(data);
@@ -36,14 +36,21 @@ public class OrderListAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
         switch (helper.getItemViewType()) {
             case TYPE_FOR_PAYMENT:
                 OrderListBean.DataBeanX.DataBean dataBean = (OrderListBean.DataBeanX.DataBean) item;
+                if (dataBean ==null){
+                    return;
+                }
                 helper.setText(R.id.tv_order_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_order_time), dataBean.getCrtTime()));
-                helper.setText(R.id.tv_city, dataBean.getDetail().getStart_city_name());
+                if (dataBean.getOrderRentVehicleDetail() !=null && dataBean.getOrderRentVehicleDetail().getStart_city_name()!=null) {
+                    helper.setText(R.id.tv_city, dataBean.getOrderRentVehicleDetail().getStart_city_name());
+                }
                 helper.loadRoundImage(mContext, dataBean.getPicture(), (ImageView) helper.getView(R.id.iv_goods), 10);
                 helper.setText(R.id.tv_car_type, dataBean.getName());
-                helper.setText(R.id.tv_get_time, TimeManager.stampToDate(String.valueOf(dataBean.getDetail().getStart_time())));
-                helper.setText(R.id.tv_get_address, dataBean.getDetail().getStart_addr());
-                helper.setText(R.id.tv_out_time, TimeManager.stampToDate(String.valueOf(dataBean.getDetail().getEnd_time())));
-                helper.setText(R.id.tv_out_address, dataBean.getDetail().getEnd_addr());
+                if (dataBean.getOrderRentVehicleDetail() !=null) {
+                    helper.setText(R.id.tv_get_time, TimeManager.stampToDate(String.valueOf(dataBean.getOrderRentVehicleDetail().getStart_time())));
+                    helper.setText(R.id.tv_get_address, dataBean.getOrderRentVehicleDetail().getStart_addr());
+                    helper.setText(R.id.tv_out_time, TimeManager.stampToDate(String.valueOf(dataBean.getOrderRentVehicleDetail().getEnd_time())));
+                    helper.setText(R.id.tv_out_address, dataBean.getOrderRentVehicleDetail().getEnd_addr());
+                }
                 helper.setText(R.id.tv_price, String.format("￥%1$s", dataBean.getOrderAmount()));
                 String orderState = "";
                 String processName = "";
@@ -74,19 +81,24 @@ public class OrderListAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
                 helper.addOnClickListener(R.id.tv_process);
                 break;
             case TYPE_TO_TRAVEL:
-                ToTravelBean toTravelBean = (ToTravelBean) item;
-                helper.setText(R.id.tv_order_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_order_time), "2019-8-12"));
+                OrderListBean.DataBeanX.DataBean dataBean2 = (OrderListBean.DataBeanX.DataBean) item;
+                if (dataBean2 == null) {
+                    return;
+                }
+                if (dataBean2.getOrderTourDetail() ==null ){
+                    return;
+                }
+                helper.setText(R.id.tv_order_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_order_time), dataBean2.getCrtTime()));
                 helper.setText(R.id.tv_city, "东莞市");
                 helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_for_payment));
-                String urls = "https://gss1.bdstatic.com/-vo3dSag_xI4khGkpoWK1HF6hhy/baike/c0%3Dbaike180%2C5%2C5%2C180%2C60/sign=fc8e9183fd03738dca470470d272db34/10dfa9ec8a136327275f2c109a8fa0ec08fac767.jpg";
-                helper.loadRoundImage(mContext, urls, (ImageView) helper.getView(R.id.iv_goods), 50);
-                helper.setText(R.id.tv_car_type, "奔驰最新款霸道房车");
-                helper.setText(R.id.tv_out_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_to_time), "2019-7-4"));
+                helper.loadRoundImage(mContext, dataBean2.getPicture(), (ImageView) helper.getView(R.id.iv_goods), 50);
+                helper.setText(R.id.tv_car_type, dataBean2.getName());
+                helper.setText(R.id.tv_out_time, mContext.getString(R.string.rv_to_time) +TimeManager.stampToDate(String.valueOf( dataBean2.getOrderTourDetail().getStartTime())));
                 helper.setText(R.id.tv_count_person, String.format("%1$s%2$s%2$s", mContext.getString(R.string.rv_to_time), "6", mContext.getString(R.string.rv_person)));
                 helper.setText(R.id.tv_price, String.format("￥%1$s", "3200000"));
-                helper.setText(R.id.tv_camp_process, toTravelBean.name);
+                helper.setText(R.id.tv_camp_process,mContext.getString(R.string.rv_to_pay_for));
                 helper.addOnClickListener(R.id.tv_camp_process);
-                helper.setGone(R.id.tv_camp_process, TextUtils.isEmpty(toTravelBean.name) ? false : true);
+                helper.setGone(R.id.tv_camp_process, TextUtils.isEmpty(mContext.getString(R.string.rv_to_pay_for)) ? false : true);
                 break;
         }
     }

RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/adapter/ToTravelAdapter.java

@@ -20,9 +20,9 @@ import java.util.List;
  * Desc:待出行
  */
 
-public class ToTravelAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,BaseGlideHolder> {
-    public static final int TYPE_FOR_PAYMENT=0;
-    public static final int TYPE_TO_TRAVEL=1;
+public class ToTravelAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity, BaseGlideHolder> {
+    public static final int TYPE_FOR_PAYMENT = 1;
+    public static final int TYPE_TO_TRAVEL = 2;
 
     public ToTravelAdapter(List<MultiItemEntity> data) {
         super(data);
@@ -32,41 +32,53 @@ public class ToTravelAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,B
 
     @Override
     protected void convert(BaseGlideHolder helper, MultiItemEntity item) {
-        switch (helper.getItemViewType()){
+        OrderListBean.DataBeanX.DataBean dataBean = (OrderListBean.DataBeanX.DataBean) item;
+        if (dataBean == null) {
+            return;
+        }
+        switch (dataBean.getType()) {
             case TYPE_FOR_PAYMENT:
-                OrderListBean.DataBeanX.DataBean dataBean= (OrderListBean.DataBeanX.DataBean) item;
-                helper.setText(R.id.tv_order_time,String.format("%1$s%2$s",mContext.getString(R.string.rv_order_time),dataBean.getCrtTime()));
-                helper.setText(R.id.tv_city,dataBean.getDetail().getStart_city_name());
-                helper.setText(R.id.tv_order_state,mContext.getString(R.string.rv_order_to_travel));
-                helper.loadRoundImage(mContext,dataBean.getPicture(), (ImageView) helper.getView(R.id.iv_goods),10);
-                helper.setText(R.id.tv_car_type,dataBean.getName());
-                helper.setText(R.id.tv_get_time, TimeManager.stampToDate(String.valueOf(dataBean.getDetail().getStart_time())));
-                helper.setText(R.id.tv_get_address,dataBean.getDetail().getStart_addr());
-                helper.setText(R.id.tv_out_time, TimeManager.stampToDate(String.valueOf(dataBean.getDetail().getEnd_time())));
-                helper.setText(R.id.tv_out_address,dataBean.getDetail().getEnd_addr());
-                helper.setText(R.id.tv_price,String.format("￥%1$s",dataBean.getOrderAmount()));
-                helper.setText(R.id.tv_process,mContext.getString(R.string.rv_to_get_car));
+                helper.setText(R.id.tv_order_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_order_time), dataBean.getCrtTime()));
+                if (dataBean.getOrderRentVehicleDetail() != null && dataBean.getOrderRentVehicleDetail().getStart_city_name() != null) {
+                    helper.setText(R.id.tv_city, dataBean.getOrderRentVehicleDetail().getStart_city_name());
+                }
+                helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_to_travel));
+                helper.loadRoundImage(mContext, dataBean.getPicture(), (ImageView) helper.getView(R.id.iv_goods), 10);
+                helper.setText(R.id.tv_car_type, dataBean.getName());
+                if (dataBean.getOrderRentVehicleDetail() != null) {
+                    helper.setText(R.id.tv_get_time, TimeManager.stampToDate(String.valueOf(dataBean.getOrderRentVehicleDetail().getStart_time())));
+                    helper.setText(R.id.tv_get_address, dataBean.getOrderRentVehicleDetail().getStart_addr());
+                    helper.setText(R.id.tv_out_time, TimeManager.stampToDate(String.valueOf(dataBean.getOrderRentVehicleDetail().getEnd_time())));
+                    helper.setText(R.id.tv_out_address, dataBean.getOrderRentVehicleDetail().getEnd_addr());
+                }
+                helper.setText(R.id.tv_price, String.format("￥%1$s", dataBean.getOrderAmount()));
+                helper.setText(R.id.tv_process, mContext.getString(R.string.rv_to_get_car));
                 helper.addOnClickListener(R.id.tv_process);
                 break;
             case TYPE_TO_TRAVEL:
-                ToTravelBean toTravelBean= (ToTravelBean) item;
-                helper.setText(R.id.tv_order_time,String.format("%1$s%2$s",mContext.getString(R.string.rv_order_time),"2019-8-12"));
-                helper.setText(R.id.tv_city,"东莞市");
-                helper.setText(R.id.tv_order_state,mContext.getString(R.string.rv_order_for_payment));
-                String urls="https://gss1.bdstatic.com/-vo3dSag_xI4khGkpoWK1HF6hhy/baike/c0%3Dbaike180%2C5%2C5%2C180%2C60/sign=fc8e9183fd03738dca470470d272db34/10dfa9ec8a136327275f2c109a8fa0ec08fac767.jpg";
-                helper.loadRoundImage(mContext,urls, (ImageView) helper.getView(R.id.iv_goods),50);
-                helper.setText(R.id.tv_car_type,"奔驰最新款霸道房车");
-                helper.setText(R.id.tv_out_time,String.format("%1$s%2$s",mContext.getString(R.string.rv_to_time),"2019-7-4"));
-                helper.setText(R.id.tv_count_person,String.format("%1$s%2$s%2$s",mContext.getString(R.string.rv_to_time),"6",mContext.getString(R.string.rv_person)));
-                helper.setText(R.id.tv_price,String.format("￥%1$s","3200000"));
-                helper.setText(R.id.tv_camp_process,toTravelBean.name);
+                OrderListBean.DataBeanX.DataBean dataBean2 = (OrderListBean.DataBeanX.DataBean) item;
+                if (dataBean2 == null) {
+                    return;
+                }
+                if (dataBean2.getOrderTourDetail() ==null ){
+                    return;
+                }
+                helper.setText(R.id.tv_order_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_order_time), dataBean2.getCrtTime()));
+                helper.setText(R.id.tv_city, "东莞市");
+                helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_for_payment));
+                helper.loadRoundImage(mContext, dataBean2.getPicture(), (ImageView) helper.getView(R.id.iv_goods), 50);
+                helper.setText(R.id.tv_car_type, dataBean2.getName());
+                helper.setText(R.id.tv_out_time, mContext.getString(R.string.rv_to_time) +TimeManager.stampToDate(String.valueOf( dataBean2.getOrderTourDetail().getStartTime())));
+                helper.setText(R.id.tv_count_person, String.format("%1$s%2$s%2$s", mContext.getString(R.string.rv_to_time), "6", mContext.getString(R.string.rv_person)));
+                helper.setText(R.id.tv_price, String.format("￥%1$s", "3200000"));
+                helper.setText(R.id.tv_camp_process, mContext.getString(R.string.rv_to_pay_for));
                 helper.addOnClickListener(R.id.tv_camp_process);
-                helper.setGone(R.id.tv_camp_process, TextUtils.isEmpty(toTravelBean.name)?false:true);
+                helper.setGone(R.id.tv_camp_process, TextUtils.isEmpty(dataBean2.getName())  ? false : true);
                 break;
         }
     }
 
-    public void addNewData(OrderListBean bean){
+    public void addNewData(OrderListBean bean) {
         mData.clear();
         addData(bean.getData().getData());
         notifyDataSetChanged();

RvHome/src/main/res/layout/activity_order_to_travel.xml

@@ -27,6 +27,7 @@
             android:ellipsize="end"
             android:gravity="center"
             android:maxLines="1"
+            android:text="订单详情"
             android:maxWidth="320dp"
             android:textColor="@color/textMain"
             android:textSize="@dimen/text_18" />

RvHome/src/main/res/layout/activity_travel_order_details.xml

 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout 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"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".rv.module.ui.main.home.order.TravelOrderDetailsActivity">
+    android:layout_height="match_parent">
 
-</android.support.constraint.ConstraintLayout>
+    <RelativeLayout
\ No newline at end of file
+        android:id="@+id/lay_title"
+        android:layout_width="match_parent"
+        android:background="@color/colorAuxiliaryYellow"
+        android:layout_height="@dimen/size_55">
+
+        <ImageView
+            android:id="@+id/iv_back"
+            android:layout_width="@dimen/size_32"
+            android:layout_height="@dimen/size_32"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="@dimen/size_5"
+            android:padding="@dimen/size_8"
+            android:src="@drawable/rv_common_icon_back_dark" />
+
+        <TextView
+            android:id="@+id/tv_center"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:ellipsize="end"
+            android:gravity="center"
+            android:maxLines="1"
+            android:maxWidth="320dp"
+            android:text="订单详情"
+            android:textColor="@color/textMain"
+            android:textSize="@dimen/text_18" />
+
+        <ImageView
+            android:id="@+id/iv_customer_service"
+            android:layout_width="@dimen/size_42"
+            android:layout_height="@dimen/size_32"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:src="@drawable/rv_rentingcar_icon_service_white"
+            android:layout_marginRight="@dimen/size_5"
+            android:padding="@dimen/size_8" />
+
+    </RelativeLayout>
+
+    <include layout="@layout/common_line"/>
+
+    <WebView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:id="@+id/webView" />
+
+    <include layout="@layout/common_line"/>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/size_70"
+        android:paddingLeft="@dimen/size_12"
+        android:paddingRight="@dimen/size_12"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/tv_cancel_order"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="@dimen/size_50"
+            android:textSize="@dimen/text_14"
+            android:gravity="center"
+            android:layout_marginRight="@dimen/size_5"
+            android:background="@drawable/shape_rv_border_gray"
+            android:textColor="@color/textGray"
+            android:text="@string/rv_cancel_order"
+            />
+
+        <TextView
+            android:id="@+id/tv_pick_up_the_car"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="@dimen/size_50"
+            android:textSize="@dimen/text_14"
+            android:gravity="center"
+            android:layout_marginLeft="@dimen/size_5"
+            android:background="@drawable/shape_rv_bg_yellow"
+            android:textColor="@color/colorWrite"
+            android:text="@string/rv_pick_up_the_car"
+            />
+    </LinearLayout>
+
+</LinearLayout>

RvHome/src/main/res/values/strings.xml

@@ -165,5 +165,7 @@
     <string name="rv_to_evaluate">去评价</string>
     <string name="rv_contact_staff">联系工作人员</string>
     <string name="deposit_information">押金信息</string>
+    <string name="order_details_title">订单详情</string>
+    <string name="rv_charge_details">费用明细</string>
     <!--=================================================房车结束========================================-->
 </resources>