旅游模块的接口、交互基本完成。

MyFrame/src/main/java/com/frame/base/glide/GlideManager.java

@@ -40,7 +40,7 @@ public class GlideManager {
                 .load(path)
                 .placeholder(com.base.resource.R.mipmap.glide_icon_placeholder)
                 .error(com.base.resource.R.mipmap.glide_icon_error)
-                .skipMemoryCache(true)
+                .skipMemoryCache(false)
                 .diskCacheStrategy(DiskCacheStrategy.ALL)
                 .into(image);
     }

OkGo/src/main/java/com/yuyife/okgo/OkGoUtil.java

@@ -61,6 +61,16 @@ public class OkGoUtil {
         return null;
     }
 
+    /**
+     * 清空Token
+     */
+    public static void clearToken(){
+        if (application ==null)
+            return;
+        SharedPreferences sp = application.getSharedPreferences(OkGoUtil.class.getSimpleName(), Context.MODE_PRIVATE);
+        sp.edit().clear().commit();
+    }
+
     @SuppressLint("StaticFieldLeak")
     private static Context application = null;
     private static boolean addToken = false;

RvClient/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "com.test.rv"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1
-        versionName "1.0"
+        versionCode 30
+        versionName "3.0"
         multiDexEnabled true
 
         //新版Gradle 是 implementation 为了兼容compile,写上这句话

RvClient/src/main/AndroidManifest.xml

@@ -360,7 +360,21 @@
             android:screenOrientation="portrait" />
 
         <!--身份证认证-->
-        <activity android:name="com.rv.rvmine.IDCardCertificationActivity"
+        <activity android:name="com.rv.rvmine.personal.IDCardCertificationActivity"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait" />
+
+        <!--添加出游人-->
+        <activity android:name="com.rv.rvmine.traveler.AddAVisitorActivity"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait" />
+
+        <!--设置-->
+        <activity android:name="com.rv.rvmine.traveler.SettingActivity"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait" />
+
+        <activity android:name="com.rv.home.rv.module.ui.main.home.order.TravelOrderDetailsActivity"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <!--=================================================================-->

RvFrame/build.gradle

@@ -55,5 +55,7 @@ android {
         api "com.tencent.mm.opensdk:wechat-sdk-android-with-mta:$rootProject.ext.wechatPayVersion"
         //https://github.com/Justson/AgentWeb
         api 'com.just.agentweb:agentweb:4.0.3-beta'
+        //api 'com.just.agentweb:filechooser:4.0.3-beta'
+        //api 'com.just.agentweb:download:4.0.3-beta'
     }
 }

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/AllOrderFragment.java

@@ -70,7 +70,11 @@ public class AllOrderFragment extends BaseFragment<CommonPresenter> implements B
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                 OrderListBean.DataBeanX.DataBean dataBean = (OrderListBean.DataBeanX.DataBean) adapter.getItem(position);
-                startActivity(OrderDetailActivity.getIntent(_mActivity,dataBean.getNo(),dataBean.getStatusX()));
+                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);
+                }
             }
         });
     }

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

@@ -81,7 +81,11 @@ public class CompletedFragment extends BaseFragment<CommonPresenter>implements B
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                 OrderListBean.DataBeanX.DataBean dataBean = (OrderListBean.DataBeanX.DataBean) adapter.getItem(position);
-                startActivity(OrderDetailActivity.getIntent(_mActivity,dataBean.getNo(),dataBean.getStatusX()));
+                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);
+                }
             }
         });
     }

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/HaveToTravelFragment.java

@@ -68,7 +68,11 @@ public class HaveToTravelFragment extends BaseFragment<CommonPresenter>implement
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                 OrderListBean.DataBeanX.DataBean dataBean = (OrderListBean.DataBeanX.DataBean) adapter.getItem(position);
-                startActivity(OrderDetailActivity.getIntent(_mActivity,dataBean.getNo(),dataBean.getStatusX()));
+                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);
+                }
             }
         });
     }

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/ToTravelFragment.java

@@ -67,7 +67,11 @@ public class ToTravelFragment extends BaseFragment<CommonPresenter> implements B
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                 OrderListBean.DataBeanX.DataBean dataBean = (OrderListBean.DataBeanX.DataBean) adapter.getItem(position);
-                startActivity(OrderDetailActivity.getIntent(_mActivity,dataBean.getNo(),dataBean.getStatusX()));
+                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);
+                }
             }
         });
     }

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/java/com/rv/home/rv/module/ui/main/home/order/bean/OrderListBean.java

@@ -13,7 +13,7 @@ import java.util.List;
  * Desc:订单列表
  */
 
-public class OrderListBean extends BaseBean{
+public class OrderListBean extends BaseBean {
 
 
     /**
@@ -98,7 +98,7 @@ public class OrderListBean extends BaseBean{
         public static class DataBean implements MultiItemEntity {
             /**
              * no : 4a0c200a-c4f0-4c37-8cdc-d2ee5cc08c20
-             * type : 1
+             * type : 1  订单类型 1–租车；2–旅游
              * status : 3
              * goodsAmount : 71200.02
              * orderAmount : 91200.02
@@ -132,7 +132,8 @@ public class OrderListBean extends BaseBean{
             private String updUser;
             private String updName;
             private String updHost;
-            private DetailBean detail;
+            private OrderRentVehicleDetail orderRentVehicleDetail;
+            private OrderTourDetail orderTourDetail;
             private int detailId;
             private String name;
 
@@ -264,12 +265,20 @@ public class OrderListBean extends BaseBean{
                 this.updHost = updHost;
             }
 
-            public DetailBean getDetail() {
-                return detail;
+            public OrderRentVehicleDetail getOrderRentVehicleDetail() {
+                return orderRentVehicleDetail;
             }
 
-            public void setDetail(DetailBean detail) {
-                this.detail = detail;
+            public void setOrderRentVehicleDetail(OrderRentVehicleDetail detail) {
+                this.orderRentVehicleDetail = orderRentVehicleDetail;
+            }
+
+            public OrderTourDetail getOrderTourDetail() {
+                return orderTourDetail;
+            }
+
+            public void setOrderTourDetail(OrderTourDetail orderTourDetail) {
+                this.orderTourDetail = orderTourDetail;
             }
 
             public int getDetailId() {
@@ -279,11 +288,13 @@ public class OrderListBean extends BaseBean{
             public void setDetailId(int detailId) {
                 this.detailId = detailId;
             }
+
             @Override
             public int getItemType() {
-                return OrderListAdapter.TYPE_FOR_PAYMENT;
+                return type;
             }
-            public static class DetailBean {
+
+            public static class OrderRentVehicleDetail {
                 /**
                  * start_city_name : 东莞市
                  * end_addr : 廊坊分公司
@@ -309,123 +320,123 @@ public class OrderListBean extends BaseBean{
                  * end_city : 0
                  */
 
-                private String start_city_name;
-                private String end_addr;
-                private int driver_type;
-                private long end_time;
-                private int day_num;
-                private int end_company_id;
-                private String cost_detail;
-                private int model_id;
-                private String end_city_name;
-                private int s_userid;
-                private long start_time;
-                private int start_company_id;
+                private String startCityName;
+                private String endAddr;
+                private int driverType;
+                private long endTime;
+                private int dayNum;
+                private int endCompanyId;
+                private String costDetail;
+                private int modelId;
+                private String endCityName;
+                private int sUserid;
+                private long startTime;
+                private int startCompanyId;
                 private int score;
-                private int s_time;
+                private int sTime;
                 private double deposit;
-                private long crt_time;
-                private long upd_time;
+                private long crtTime;
+                private long updTime;
                 private int id;
-                private int start_city;
-                private String start_addr;
-                private int order_id;
-                private int end_city;
+                private int startCity;
+                private String startAddr;
+                private int orderId;
+                private int endCity;
 
                 public String getStart_city_name() {
-                    return start_city_name;
+                    return startCityName;
                 }
 
                 public void setStart_city_name(String start_city_name) {
-                    this.start_city_name = start_city_name;
+                    this.startCityName = start_city_name;
                 }
 
                 public String getEnd_addr() {
-                    return end_addr;
+                    return endAddr;
                 }
 
                 public void setEnd_addr(String end_addr) {
-                    this.end_addr = end_addr;
+                    this.endAddr = end_addr;
                 }
 
                 public int getDriver_type() {
-                    return driver_type;
+                    return driverType;
                 }
 
                 public void setDriver_type(int driver_type) {
-                    this.driver_type = driver_type;
+                    this.driverType = driver_type;
                 }
 
                 public long getEnd_time() {
-                    return end_time;
+                    return endTime;
                 }
 
                 public void setEnd_time(long end_time) {
-                    this.end_time = end_time;
+                    this.endTime = end_time;
                 }
 
                 public int getDay_num() {
-                    return day_num;
+                    return dayNum;
                 }
 
                 public void setDay_num(int day_num) {
-                    this.day_num = day_num;
+                    this.dayNum = day_num;
                 }
 
                 public int getEnd_company_id() {
-                    return end_company_id;
+                    return endCompanyId;
                 }
 
                 public void setEnd_company_id(int end_company_id) {
-                    this.end_company_id = end_company_id;
+                    this.endCompanyId = end_company_id;
                 }
 
                 public String getCost_detail() {
-                    return cost_detail;
+                    return costDetail;
                 }
 
                 public void setCost_detail(String cost_detail) {
-                    this.cost_detail = cost_detail;
+                    this.costDetail = cost_detail;
                 }
 
                 public int getModel_id() {
-                    return model_id;
+                    return modelId;
                 }
 
                 public void setModel_id(int model_id) {
-                    this.model_id = model_id;
+                    this.modelId = model_id;
                 }
 
                 public String getEnd_city_name() {
-                    return end_city_name;
+                    return endCityName;
                 }
 
                 public void setEnd_city_name(String end_city_name) {
-                    this.end_city_name = end_city_name;
+                    this.endCityName = end_city_name;
                 }
 
                 public int getS_userid() {
-                    return s_userid;
+                    return sUserid;
                 }
 
                 public void setS_userid(int s_userid) {
-                    this.s_userid = s_userid;
+                    this.sUserid = s_userid;
                 }
 
                 public long getStart_time() {
-                    return start_time;
+                    return startTime;
                 }
 
                 public void setStart_time(long start_time) {
-                    this.start_time = start_time;
+                    this.startTime = start_time;
                 }
 
                 public int getStart_company_id() {
-                    return start_company_id;
+                    return startCompanyId;
                 }
 
                 public void setStart_company_id(int start_company_id) {
-                    this.start_company_id = start_company_id;
+                    this.startCompanyId = start_company_id;
                 }
 
                 public int getScore() {
@@ -437,11 +448,11 @@ public class OrderListBean extends BaseBean{
                 }
 
                 public int getS_time() {
-                    return s_time;
+                    return sTime;
                 }
 
                 public void setS_time(int s_time) {
-                    this.s_time = s_time;
+                    this.sTime = s_time;
                 }
 
                 public double getDeposit() {
@@ -453,19 +464,19 @@ public class OrderListBean extends BaseBean{
                 }
 
                 public long getCrt_time() {
-                    return crt_time;
+                    return crtTime;
                 }
 
                 public void setCrt_time(long crt_time) {
-                    this.crt_time = crt_time;
+                    this.crtTime = crt_time;
                 }
 
                 public long getUpd_time() {
-                    return upd_time;
+                    return updTime;
                 }
 
                 public void setUpd_time(long upd_time) {
-                    this.upd_time = upd_time;
+                    this.updTime = upd_time;
                 }
 
                 public int getId() {
@@ -477,35 +488,245 @@ public class OrderListBean extends BaseBean{
                 }
 
                 public int getStart_city() {
-                    return start_city;
+                    return startCity;
                 }
 
                 public void setStart_city(int start_city) {
-                    this.start_city = start_city;
+                    this.startCity = start_city;
                 }
 
                 public String getStart_addr() {
-                    return start_addr;
+                    return startAddr;
                 }
 
                 public void setStart_addr(String start_addr) {
-                    this.start_addr = start_addr;
+                    this.startAddr = start_addr;
                 }
 
                 public int getOrder_id() {
-                    return order_id;
+                    return orderId;
                 }
 
                 public void setOrder_id(int order_id) {
-                    this.order_id = order_id;
+                    this.orderId = order_id;
                 }
 
                 public int getEnd_city() {
-                    return end_city;
+                    return endCity;
                 }
 
                 public void setEnd_city(int end_city) {
-                    this.end_city = end_city;
+                    this.endCity = end_city;
+                }
+            }
+
+            public static class OrderTourDetail {
+                /**
+                 * contactEmail	string
+                 * 联系邮箱
+                 * <p>
+                 * contactMan	string
+                 * 联系人
+                 * <p>
+                 * contactPhone	string
+                 * 联系电话
+                 * <p>
+                 * costDetail	string
+                 * 费用明细
+                 * <p>
+                 * dayNum	integer($int32)
+                 * 天数
+                 * <p>
+                 * endAddr	string
+                 * 还车地点
+                 * <p>
+                 * endTime	integer($int64)
+                 * 结束时间
+                 * <p>
+                 * goodId	integer($int32)
+                 * 商品id
+                 * <p>
+                 * id	integer($int32)
+                 * 主键
+                 * <p>
+                 * name	string
+                 * 名称
+                 * <p>
+                 * orderId	integer($int32)
+                 * 基础订单id
+                 * <p>
+                 * speIds	string
+                 * 规格ids
+                 * <p>
+                 * spePriceId	integer($int32)
+                 * 具体商品（商品项）id
+                 * <p>
+                 * startAddr	string
+                 * 出发地点
+                 * <p>
+                 * startCompanyId	integer($int32)
+                 * 出发公司Id
+                 * <p>
+                 * startTime	integer($int64)
+                 * 开始时间
+                 * <p>
+                 * tourUserIds	string
+                 * 出游乘客ids
+                 */
+
+                private String id;
+                private String orderId;
+                private String crtTime;//": 1560163254063,
+                private String updTime;//": 1560163254063,
+                private String startTime;//": 1560152144000,
+                private String endTime;//": 1560324944000,
+                private String startAddr;//": "东土",
+                private String endAddr;//": "西天3",
+                private String tourUserIds;//": "4,5",
+                private String startCompanyId;//": 2,
+                private String costDetail;
+                private String goodId;//": 37,
+                private String speIds;//": "string",
+                private String spePriceId;//": 109,
+                private String contactMan;//": "周2",
+                private String contactPhone;//": "13712398220",
+                private String contactEmail;//":
+
+
+                public String getId() {
+                    return id;
+                }
+
+                public void setId(String id) {
+                    this.id = id;
+                }
+
+                public String getOrderId() {
+                    return orderId;
+                }
+
+                public void setOrderId(String orderId) {
+                    this.orderId = orderId;
+                }
+
+                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 getStartTime() {
+                    return startTime;
+                }
+
+                public void setStartTime(String startTime) {
+                    this.startTime = startTime;
+                }
+
+                public String getEndTime() {
+                    return endTime;
+                }
+
+                public void setEndTime(String endTime) {
+                    this.endTime = endTime;
+                }
+
+                public String getStartAddr() {
+                    return startAddr;
+                }
+
+                public void setStartAddr(String startAddr) {
+                    this.startAddr = startAddr;
+                }
+
+                public String getEndAddr() {
+                    return endAddr;
+                }
+
+                public void setEndAddr(String endAddr) {
+                    this.endAddr = endAddr;
+                }
+
+                public String getTourUserIds() {
+                    return tourUserIds;
+                }
+
+                public void setTourUserIds(String tourUserIds) {
+                    this.tourUserIds = tourUserIds;
+                }
+
+                public String getStartCompanyId() {
+                    return startCompanyId;
+                }
+
+                public void setStartCompanyId(String startCompanyId) {
+                    this.startCompanyId = startCompanyId;
+                }
+
+                public String getCostDetail() {
+                    return costDetail;
+                }
+
+                public void setCostDetail(String costDetail) {
+                    this.costDetail = costDetail;
+                }
+
+                public String getGoodId() {
+                    return goodId;
+                }
+
+                public void setGoodId(String goodId) {
+                    this.goodId = goodId;
+                }
+
+                public String getSpeIds() {
+                    return speIds;
+                }
+
+                public void setSpeIds(String speIds) {
+                    this.speIds = speIds;
+                }
+
+                public String getSpePriceId() {
+                    return spePriceId;
+                }
+
+                public void setSpePriceId(String spePriceId) {
+                    this.spePriceId = spePriceId;
+                }
+
+                public String getContactMan() {
+                    return contactMan;
+                }
+
+                public void setContactMan(String contactMan) {
+                    this.contactMan = contactMan;
+                }
+
+                public String getContactPhone() {
+                    return contactPhone;
+                }
+
+                public void setContactPhone(String contactPhone) {
+                    this.contactPhone = contactPhone;
+                }
+
+                public String getContactEmail() {
+                    return contactEmail;
+                }
+
+                public void setContactEmail(String contactEmail) {
+                    this.contactEmail = contactEmail;
                 }
             }
         }

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/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>

RvMine/build.gradle

@@ -24,6 +24,7 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     api 'com.jakewharton:butterknife:8.8.1'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
     api project(':RvHome')
 }

RvMine/src/main/AndroidManifest.xml

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

RvMine/src/main/java/com/rv/rvmine/IDCardCertificationActivity.java

-package com.rv.rvmine;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-
-import com.ruiwenliu.wrapper.base.BaseBean;
-import com.ruiwenliu.wrapper.base.BaseStatusActivity;
-import com.ruiwenliu.wrapper.weight.TitleView;
-import com.rv.home.rv.module.basic.presenter.PickerPresenter;
-
-public class IDCardCertificationActivity extends BaseStatusActivity<PickerPresenter> {
-
-
-    public static Intent getIntent(Context context) {
-        return new Intent(context, IDCardCertificationActivity.class);
-    }
-
-    @Override
-    protected int setLayout() {
-        return R.layout.activity_idcard_certification;
-    }
-
-    @Override
-    protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
-       titleView.setTitle(mActivity.getString(R.string.tv_id_card_certrfication_title));
-    }
-
-    @Override
-    public void onShowResult(int requestType, BaseBean result) {
-
-    }
-}

RvMine/src/main/java/com/rv/rvmine/MineActivity.java

 package com.rv.rvmine;
 
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
@@ -10,8 +12,9 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.base.utils.base.BaseActivity;
+import com.base.utils.tools.android.IntentUtil;
 import com.base.utils.ui.image.round.RoundImageView;
+import com.frame.base.browse.ActivityImageBrowseInt;
 import com.frame.base.glide.GlideManager;
 import com.frame.rv.BaseTabLayout;
 import com.frame.rv.ModuleChangeUtil;
@@ -23,10 +26,18 @@ import com.ruiwenliu.wrapper.weight.TitleView;
 import com.rv.home.rv.module.basic.presenter.CommonPresenter;
 import com.rv.home.rv.module.ui.login.LoginRvActivity;
 import com.rv.home.rv.module.ui.main.home.order.OrderListActivity;
+import com.rv.rvmine.personal.IDCardCertificationActivity;
+import com.rv.rvmine.traveler.SettingActivity;
+import com.yuyife.banner.Banner;
+import com.yuyife.banner.BannerConfig;
+import com.yuyife.banner.listener.OnBannerListener;
+import com.yuyife.banner.loader.ImageLoader;
 import com.yuyife.okgo.OkGoUtil;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import butterknife.BindView;
-import butterknife.ButterKnife;
 import butterknife.OnClick;
 
 public class MineActivity extends BaseStatusActivity<CommonPresenter> {
@@ -71,6 +82,8 @@ public class MineActivity extends BaseStatusActivity<CommonPresenter> {
     RelativeLayout rlItemSetting;
     @BindView(R2.id.travel_fragment_layout)
     LinearLayout travelFragmentLayout;
+    @BindView(R2.id.mine_banner)
+    Banner mineBanner;
 
     @Override
     protected int setLayout() {
@@ -83,20 +96,20 @@ public class MineActivity extends BaseStatusActivity<CommonPresenter> {
 
         showTitle(false);
         travelTabLayout.setCurrent(OnModuleChangedListener.MODULE_MINE);
-
-        if (TextUtils.isEmpty( OkGoUtil.getToken())) {
+        setBanner();
+        if (TextUtils.isEmpty(OkGoUtil.getToken())) {
             tvNickname.setVisibility(View.GONE);
             ivMember.setVisibility(View.GONE);
             tvLogin.setVisibility(View.VISIBLE);
             tvVerified.setVisibility(View.GONE);
-        }else {
+        } else {
             tvNickname.setVisibility(View.VISIBLE);
             ivMember.setVisibility(View.VISIBLE);
             tvLogin.setVisibility(View.GONE);
             tvVerified.setVisibility(View.VISIBLE);
-            Log.i("Mineactivityty", "initView: " +UtilsManager.getInstance(mActivity).getSPStringCode("city_json","headerurl"));
-            GlideManager.getInstance(mActivity).loadImage(UtilsManager.getInstance(mActivity).getSPStringCode("city_json","headerurl"), ivAvatar);
-            tvNickname.setText(UtilsManager.getInstance(mActivity).getSPStringCode("city_json","username"));
+//            Log.i("Mineactivityty", "initView: " + UtilsManager.getInstance(mActivity).getSPStringCode("city_json", "headerurl"));
+            GlideManager.getInstance(mActivity).loadImage(UtilsManager.getInstance(mActivity).getSPStringCode("city_json", "headerurl"), ivAvatar);
+            tvNickname.setText(UtilsManager.getInstance(mActivity).getSPStringCode("city_json", "username"));
         }
     }
 
@@ -110,59 +123,118 @@ public class MineActivity extends BaseStatusActivity<CommonPresenter> {
     @OnClick({R2.id.iv_avatar, R2.id.tv_login, R2.id.tv_verified, R2.id.rl_item_to_be_paid, R2.id.rl_item_staying, R2.id.rl_item_traveling, R2.id.rl_item_completed, R2.id.rl_item_all, R2.id.rl_item_collection, R2.id.rl_item_personal_information, R2.id.rl_item_information, R2.id.rl_item_setting})
     public void onViewClicked(View view) {
         int id = view.getId();
-        if (id ==R.id.iv_avatar){
+        if (id == R.id.iv_avatar) {
             //头像
             if (isLogin()) return;
-        }else if (id== R.id.tv_login){
+        } else if (id == R.id.tv_login) {
             //登录
             startActivity(LoginRvActivity.getIntent(mActivity));
-        }else if (id == R.id.tv_verified){
+        } else if (id == R.id.tv_verified) {
             //实名认证
             if (isLogin()) return;
             startActivity(IDCardCertificationActivity.getIntent(mActivity));
-        }else if (id == R.id.rl_item_to_be_paid){
+        } else if (id == R.id.rl_item_to_be_paid) {
             //待支付
             if (isLogin()) return;
             startActivity(OrderListActivity.getIntent(mActivity, 0));
-        }else if (id == R.id.rl_item_staying){
+        } else if (id == R.id.rl_item_staying) {
             //待出行
             if (isLogin()) return;
             startActivity(OrderListActivity.getIntent(mActivity, 1));
-        }else if (id ==R.id.rl_item_traveling){
+        } else if (id == R.id.rl_item_traveling) {
             //出行中
             if (isLogin()) return;
             startActivity(OrderListActivity.getIntent(mActivity, 2));
-        }else if (id == R.id.rl_item_completed){
+        } else if (id == R.id.rl_item_completed) {
             //已完成
             if (isLogin()) return;
             startActivity(OrderListActivity.getIntent(mActivity, 3));
-        }else if (id ==R.id.rl_item_all){
+        } else if (id == R.id.rl_item_all) {
             //全部
             if (isLogin()) return;
             startActivity(OrderListActivity.getIntent(mActivity, 4));
-        }else if (id == R.id.rl_item_collection){
+        } else if (id == R.id.rl_item_collection) {
             //收藏
             if (isLogin()) return;
             showToast("该功能还在开发中");
-        }else if (id == R.id.rl_item_personal_information){
+        } else if (id == R.id.rl_item_personal_information) {
             //个人资料
             if (isLogin()) return;
             showToast("该功能还在开发中");
-        }else if (id == R.id.rl_item_information){
+        } else if (id == R.id.rl_item_information) {
             //信息
             if (isLogin()) return;
             showToast("该功能还在开发中");
-        }else if (id ==R.id.rl_item_setting){
+        } else if (id == R.id.rl_item_setting) {
             //设置
+            startActivityForResult(SettingActivity.getIntent(mActivity),101);
+        }
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == 101 && resultCode ==201){
+            ivAvatar.setImageResource(R.drawable.common_icon_avatar_default);
+            tvNickname.setVisibility(View.GONE);
+            ivMember.setVisibility(View.GONE);
+            tvLogin.setVisibility(View.VISIBLE);
+            tvVerified.setVisibility(View.GONE);
+        }
+    }
+
+    private ArrayList<String> images = new ArrayList<>();    //图片(默认采用网络地址)
+    private List<String> titles = new ArrayList<>();         //图片标题
+    private List<Integer> localImages = new ArrayList<>();   //图片(本地资源)
+
+    private void setBanner() {
+        titles.clear();
+        images.clear();
+        localImages.clear();
+
+        localImages.add(R.drawable.abanner);
+        localImages.add(R.drawable.abanner);
+
+        mineBanner.setImages(localImages);
+        for (int i = 0; i < localImages.size(); i++) {
+            titles.add("");
         }
+        mineBanner.isAutoPlay(true)
+                .setBannerTitles(titles)
+                .setDelayTime(3000)
+                .setImageLoader(new ImageLoader() {
+                    @Override
+                    public void displayImage(Context context, Object path, ImageView imageView) {
+
+                        GlideManager.getInstance(context).loadImage(path, imageView);
+                    }
+                })
+                .setOnBannerListener(new OnBannerListener() {
+                    @Override
+                    public void OnBannerClick(int position) {
+                        if (localImages != null && localImages.size() > 0) {
+                            Bundle bundle = new Bundle();
+                            bundle.putInt(ActivityImageBrowseInt.KEY_BACKGROUND, R.color.colorPrimary);
+                            bundle.putIntegerArrayList(ActivityImageBrowseInt.KEY_IMAGE, (ArrayList<Integer>) localImages);
+                            IntentUtil.startActivity(mActivity, ActivityImageBrowseInt.class, bundle);
                         }
+                    }
+                })
+                .start();
+
+        mineBanner.updateBannerStyle(BannerConfig.CIRCLE_INDICATOR);
+    }
+
+
+
 
     /**
      * 判断是否登录
+     *
      * @return
      */
     private boolean isLogin() {
-        if (TextUtils.isEmpty( OkGoUtil.getToken())) {
+        if (TextUtils.isEmpty(OkGoUtil.getToken())) {
             startActivity(LoginRvActivity.getIntent(mActivity));
             return true;
         }

RvMine/src/main/res/layout/activity_mine.xml

@@ -46,39 +46,38 @@
                         android:orientation="vertical">
 
                         <TextView
-                            android:visibility="gone"
                             android:id="@+id/tv_nickname"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="176****8888"
                             android:textColor="@color/colorYellow"
-                            android:textSize="@dimen/text_16" />
+                            android:textSize="@dimen/text_16"
+                            android:visibility="gone" />
 
 
                         <ImageView
-                            android:visibility="gone"
                             android:id="@+id/iv_member"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="@dimen/text_10"
-                            android:src="@drawable/mycenter_icon_goldmembership" />
+                            android:src="@drawable/mycenter_icon_goldmembership"
+                            android:visibility="gone" />
 
 
                         <TextView
                             android:id="@+id/tv_login"
                             android:layout_width="@dimen/size_150"
                             android:layout_height="@dimen/size_40"
-                            android:textSize="@dimen/text_14"
-                            android:textColor="@color/colorYellow"
                             android:layout_gravity="center"
-                            android:gravity="center"
                             android:background="@drawable/resource_drawable_shape_yellow_line"
-                            android:text="@string/tv_login"/>
+                            android:gravity="center"
+                            android:text="@string/tv_login"
+                            android:textColor="@color/colorYellow"
+                            android:textSize="@dimen/text_14" />
 
                     </LinearLayout>
 
                     <TextView
-                        android:visibility="gone"
                         android:id="@+id/tv_verified"
                         android:layout_width="@dimen/text_90"
                         android:layout_height="@dimen/text_30"
@@ -86,7 +85,8 @@
                         android:gravity="center"
                         android:text="未实名认证"
                         android:textColor="@color/colorYellow"
-                        android:textSize="@dimen/text_12" />
+                        android:textSize="@dimen/text_12"
+                        android:visibility="gone" />
                 </LinearLayout>
             </LinearLayout>
 
@@ -307,11 +307,11 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-       android:background="@color/colorWrite"
             android:layout_marginTop="@dimen/size_15"
+            android:background="@color/colorWrite"
+            android:orientation="horizontal"
             android:paddingTop="@dimen/size_25"
-       android:paddingBottom="@dimen/size_15"
-       android:orientation="horizontal">
+            android:paddingBottom="@dimen/size_15">
 
             <RelativeLayout
                 android:id="@+id/rl_item_collection"
@@ -408,10 +408,16 @@
                     android:textColor="@color/colorMain"
                     android:textSize="@dimen/size_12" />
             </RelativeLayout>
-
         </LinearLayout>
 
 
+        <com.yuyife.banner.Banner
+            android:layout_marginTop="@dimen/size_15"
+            android:id="@+id/mine_banner"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/size_100" />
+
+
     </LinearLayout>
 
 

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

@@ -24,4 +24,14 @@
     <string name="tv_negative">反面</string>
     <string name="tv_id_card_photo_hint">*您所上传的身份证信息，仅用于欣新房车验证</string>
     <string name="tv_id_card_certrfication_title">身份证认证</string>
+    <string name="setting_title">设置</string>
+    <string name="et_traveler_name_hint">请输入出游人姓名</string>
+    <string name="cb_man_hint">男</string>
+    <string name="cb_girl_hint">女</string>
+    <string name="et_phone_hint">请输入出游人手机号</string>
+    <string name="tv_travel_phone">手机号码</string>
+    <string name="et_id_card_hint">请输入出游人身份证号码</string>
+    <string name="cb_adult_hint">成人</string>
+    <string name="cb_child_hint">儿童</string>
+    <string name="add_a_visitor_title">添加出游人</string>
 </resources>

RvTravel/build.gradle

@@ -13,7 +13,6 @@ android {
         versionCode 1
         versionName "1.0"
 
-
         javaCompileOptions {
             annotationProcessorOptions {
                 includeCompileClasspath = true

RvTravel/src/main/java/com/rv/travel/GoOtherUtil.java

@@ -10,10 +10,13 @@ import com.rv.travel.other.OtherOption;
 import com.rv.travel.other.TravelFragmentActivity;
 
 public class GoOtherUtil {
+    public static String travelDetailId = "0";
 
     //去旅游详情
-    public static void goTravelDetailWeb(Activity activity) {
-        String url = "https://xxtest.upyuns.com/h5/appHtml/view/travelDetails.html?id=37";
+    public static void goTravelDetailWeb(String id, Activity activity) {
+        GoOtherUtil.travelDetailId = id;
+        String url = "https://xxtest.upyuns.com/h5/appHtml/view/travelDetails.html?id=" + id;
+        //TravelFragmentActivity.currentFragment = TravelWebFragment.getInstance(url);
         TravelFragmentActivity.currentFragment = TravelWebFragment.getInstance(url);
         OtherOption otherOption = new OtherOption();
         otherOption.setTitle("详情");
@@ -34,14 +37,14 @@ public class GoOtherUtil {
     }
 
     //去确认订单
-    public static void goTravelCommitOrder(final Activity activity) {
-        TravelFragmentActivity.currentFragment = TravelFragmentCommitOrder.getInstance();
+    public static void goTravelCommitOrder(String data,final Activity activity) {
+        TravelFragmentActivity.currentFragment = TravelFragmentCommitOrder.getInstance(data);
         OtherOption otherOption = new OtherOption();
         otherOption.setTitle("确认下单");
         otherOption.setClickListener(new OtherClickListener() {
             @Override
             public void onBack() {
-                GoOtherUtil.goTravelDetailWeb(activity);
+                GoOtherUtil.goTravelDetailWeb(GoOtherUtil.travelDetailId, activity);
             }
 
             @Override

RvTravel/src/main/java/com/rv/travel/TravelActivity.java

@@ -17,9 +17,15 @@ import com.base.utils.base.BaseActivity;
 import com.frame.rv.BaseTabLayout;
 import com.frame.rv.ModuleChangeUtil;
 import com.frame.rv.OnModuleChangedListener;
+import com.rv.travel.api.ApiUtil;
+import com.rv.travel.api.OnApiResponseCallback;
+import com.rv.travel.bean.BeanHot;
+import com.rv.travel.bean.BeanTravelMember;
 import com.rv.travel.fragment.TravelFragmentHotType;
 import com.rv.travel.fragment.TravelFragmentMain;
 
+import java.util.List;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
@@ -32,10 +38,17 @@ public class TravelActivity extends BaseActivity {
         return instance;
     }
 
+    public void setHotTypeTitle(String name) {
+        typeText.setText(name);
+    }
+
+
     @BindView(R2.id.travel_tab_layout)
     BaseTabLayout tabLayout;
     @BindView(R2.id.travel_city_layout)
     LinearLayout cityLayout;
+    @BindView(R2.id.travel_type_text)
+    TextView typeText;
     @BindView(R2.id.travel_city_text)
     TextView cityText;
     @BindView(R2.id.search_input)
@@ -63,7 +76,10 @@ public class TravelActivity extends BaseActivity {
         } else if (id == R.id.travel_hot_type_select) {
             travelFragmentHotType.setHotMoreFragment();
         } else if (id == R.id.search_commit) {
-            searchInput.setText("");
+            String query = searchInput.getText().toString();
+            if (travelFragmentMain != null) {
+                travelFragmentMain.getRimData(query);
+            }
         } else if (id == R.id.travel_server_image) {
             showToastShort("联系客服");
         }
@@ -87,6 +103,24 @@ public class TravelActivity extends BaseActivity {
     @Override
     public void onData() {
         tabLayout.setCurrent(OnModuleChangedListener.MODULE_TRAVEL);
+        //13766666666 12345678
+
+        //13612688539  12345678
+        ApiUtil.getToken("13612688539", "12345678", new OnApiResponseCallback<Boolean, String>() {
+            @Override
+            public void done(Boolean data, String errorMessage) {
+                if (data) {
+                    ApiUtil.getTravelMember("1", new OnApiResponseCallback<List<BeanTravelMember>, String>() {
+                        @Override
+                        public void done(List<BeanTravelMember> data, String errorMessage) {
+
+                        }
+                    });
+                }
+            }
+        });
+
+
     }
 
     @Override
@@ -110,6 +144,9 @@ public class TravelActivity extends BaseActivity {
                     searchCommit.setVisibility(View.VISIBLE);
                 } else {
                     searchCommit.setVisibility(View.GONE);
+                    if (travelFragmentMain != null) {
+                        travelFragmentMain.getRimData("");
+                    }
                 }
             }
         });
@@ -137,10 +174,10 @@ public class TravelActivity extends BaseActivity {
     private TravelFragmentHotType travelFragmentHotType;
 
     //点击 热门游 弹出列表  点击列表条目，设置
-    public void setTravelFragmentHotType() {
+    public void setTravelFragmentHotType(BeanHot bean) {
         hotMoreTitleLayout.setVisibility(View.GONE);
         hotTypeTitleLayout.setVisibility(View.VISIBLE);
-        travelFragmentHotType = new TravelFragmentHotType();
+        travelFragmentHotType = TravelFragmentHotType.getInstance(bean);
         setFragment(travelFragmentHotType);
     }
 

RvTravel/src/main/java/com/rv/travel/adapter/AdapterHot.java

@@ -3,9 +3,12 @@ package com.rv.travel.adapter;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.CardView;
 import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
+import com.frame.base.glide.GlideManager;
 import com.rv.travel.R;
 import com.rv.travel.bean.BeanHot;
 
@@ -39,15 +42,22 @@ public class AdapterHot extends BaseQuickAdapter<BeanHot, AdapterHot.AdapterView
                 }
             }
         });
+
+        helper.itemText.setText(item.getName());
+        GlideManager.getInstance(helper.itemImage.getContext()).loadImage(item.getImg(),helper.itemImage);
     }
 
     public class AdapterViewHolder extends BaseViewHolder {
 
         CardView itemRoot;
+        TextView itemText;
+        ImageView itemImage;
 
         public AdapterViewHolder(View view) {
             super(view);
             itemRoot = view.findViewById(R.id.item_hot_card_view);
+            itemImage = view.findViewById(R.id.item_hot_bg_img);
+            itemText = view.findViewById(R.id.item_hot_text);
         }
     }
 }

RvTravel/src/main/java/com/rv/travel/adapter/AdapterRim.java

@@ -3,10 +3,12 @@ package com.rv.travel.adapter;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.CardView;
 import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
 
-import com.base.utils.tools.android.IntentUtil;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
+import com.frame.base.glide.GlideManager;
 import com.rv.travel.R;
 import com.rv.travel.bean.BeanRim;
 
@@ -40,16 +42,36 @@ public class AdapterRim extends BaseQuickAdapter<BeanRim, AdapterRim.AdapterView
                 }
             }
         });
+
+        helper.itemTitle.setText(item.getName());
+        helper.itemPrice.setText(item.getPrice());
+        helper.itemUnit.setText(item.getUnit());
+        helper.itemStock.setText(item.getStock());
+
+        GlideManager.getInstance(helper.itemImage.getContext()).loadImage(item.getCover(),helper.itemImage);
+
     }
 
     public class AdapterViewHolder extends BaseViewHolder {
 
 
         CardView itemRoot;
+        TextView itemPrice;
+        TextView itemTitle;
+        TextView itemUnit;
+        TextView itemAddress;
+        TextView itemStock;
+        ImageView itemImage;
 
         public AdapterViewHolder(View view) {
             super(view);
             itemRoot = view.findViewById(R.id.item_rim_root);
+            itemPrice = view.findViewById(R.id.item_rim_price);
+            itemTitle = view.findViewById(R.id.item_rim_title);
+            itemUnit= view.findViewById(R.id.item_rim_price_unit);
+            itemAddress= view.findViewById(R.id.item_rim_address);
+            itemStock= view.findViewById(R.id.item_rim_stock);
+            itemImage = view.findViewById(R.id.item_rim_image);
         }
     }
 }

RvTravel/src/main/java/com/rv/travel/api/ApiKey.java

+package com.rv.travel.api;
+
+public interface ApiKey {
+    String STATUS_200="200";
+    String STATUS_500="500";
+
+    String MESSAGE="message";
+    String DATA="data";
+    String STATUS="status";
+    String TOTAL="total";
+    String LIST="list";  //数组的Key
+
+
+    String ERROR_PREFIX="error:";
+
+    String ERROR_NO_STATUS="Status is null or empty";
+    String ERROR_NO_DATA="data is null or empty";
+
+}

RvTravel/src/main/java/com/rv/travel/api/ApiUtil.java

 package com.rv.travel.api;
 
+import com.base.utils.tools.android.GetUrlUtil;
 import com.base.utils.tools.android.LogUtil;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
 import com.lzy.okgo.callback.StringCallback;
 import com.lzy.okgo.model.Response;
+import com.rv.travel.bean.BeanBanner;
+import com.rv.travel.bean.BeanHot;
+import com.rv.travel.bean.BeanRim;
+import com.rv.travel.bean.BeanTravelMember;
 import com.yuyife.okgo.OkGoUtil;
 
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 public class ApiUtil {
+    //登录
+    public static void getToken(String username, String password, final OnApiResponseCallback<Boolean, String> callback) {
+        Map<String, String> map = new HashMap<>();
+        map.put("type", "1");//0-验证码登录 1-密码登录
+        map.put("username", username);
+        map.put("password", password);
+        String url = GetUrlUtil.getUrl(TravelApi.TRAVEL_LOGIN, map);
+        OkGoUtil.postJson(url, new HashMap<String, String>(), new StringCallback() {
+            @Override
+            public void onSuccess(Response<String> response) {
+
+                LogUtil.e(ApiUtil.class, "onSuccess getToken:" + response.body());
+
+                if (callback == null) return;
+                String status = OkGoUtil.getStringToJson(response.body(), ApiKey.STATUS);
+                if (status == null) {
+                    callback.done(null, ApiKey.ERROR_NO_STATUS);
+                    return;
+                }
+                if (!status.equals(ApiKey.STATUS_200)) {
+                    callback.done(null, ApiKey.ERROR_PREFIX + "--status" + status + "--message" + OkGoUtil.getStringToJson(response.body(), ApiKey.MESSAGE));
+                    return;
+                }
+                String token = OkGoUtil.getStringToJson(response.body(), "token");
+                OkGoUtil.setToken(token);
+                callback.done(true, OkGoUtil.getStringToJson(response.body(), ApiKey.MESSAGE));
+
+            }
 
-    public static void getCompanyData(){
-        Map<String,String> map = new HashMap<>();
-        map.put("id","2");
-        OkGoUtil.postJson(TravelApi.QUERY_COMPANY_DETAIL, map, new StringCallback() {
+            @Override
+            public void onError(Response<String> response) {
+                super.onError(response);
+                LogUtil.e(ApiUtil.class, "onError getToken:" + response.body());
+                LogUtil.e(ApiUtil.class, "onError getToken:" + response.message());
+                if (callback != null) {
+                    callback.done(null, response.message());
+                }
+            }
+        });
+    }
+
+    //获取公司详情
+    public static void getCompanyData(String id, final OnApiResponseCallback<List<BeanBanner>, String> callback) {
+        Map<String, String> map = new HashMap<>();
+        String url = TravelApi.QUERY_COMPANY_DETAIL + id;
+        OkGoUtil.getMap(url, map, new StringCallback() {
             @Override
             public void onSuccess(Response<String> response) {
 
-                LogUtil.e(ApiUtil.class,"onSuccess getCompanyData:"+response.body());
+                LogUtil.e(ApiUtil.class, "onSuccess getCompanyData:" + response.body());
+                if (callback == null) return;
+                String status = OkGoUtil.getStringToJson(response.body(), ApiKey.STATUS);
+                if (status == null) {
+                    callback.done(null, ApiKey.ERROR_NO_STATUS);
+                    return;
+                }
+                if (!status.equals(ApiKey.STATUS_200)) {
+                    callback.done(null, ApiKey.ERROR_PREFIX + "--status" + status + "--message" + OkGoUtil.getStringToJson(response.body(), ApiKey.MESSAGE));
+                    return;
+                }
             }
 
             @Override
             public void onError(Response<String> response) {
                 super.onError(response);
-                LogUtil.e(ApiUtil.class,"onError getCompanyData:"+response.body());
-                LogUtil.e(ApiUtil.class,"onError getCompanyData:"+response.message());
+                LogUtil.e(ApiUtil.class, "onError getCompanyData:" + response.body());
+                LogUtil.e(ApiUtil.class, "onError getCompanyData:" + response.message());
+                if (callback != null) {
+                    callback.done(null, response.message());
+                }
+            }
+        });
+    }
 
+    //获取banner 首页
+    public static void getBannerDataMain(final OnApiResponseCallback<List<BeanBanner>, String> callback) {
+        Map<String, String> map = new HashMap<>();
+        OkGoUtil.getMap(TravelApi.QUERY_BANNER_MAIN, map, new StringCallback() {
+            @Override
+            public void onSuccess(Response<String> response) {
+
+                LogUtil.e(ApiUtil.class, "onSuccess getBannerDataMain:" + response.body());
+                if (callback == null) return;
+                String status = OkGoUtil.getStringToJson(response.body(), ApiKey.STATUS);
+                if (status == null) {
+                    callback.done(null, ApiKey.ERROR_NO_STATUS);
+                    return;
+                }
+                if (!status.equals(ApiKey.STATUS_200)) {
+                    callback.done(null, ApiKey.ERROR_PREFIX + "--status" + status + "--message" + OkGoUtil.getStringToJson(response.body(), ApiKey.MESSAGE));
+                    return;
+                }
+
+                JSONArray array = OkGoUtil.getListToJson(response.body(), ApiKey.DATA);
+                List<BeanBanner> list = new ArrayList<BeanBanner>();
+                if (array != null && array.length() > 0) {
+                    for (int i = 0; i < array.length(); i++) {
+                        BeanBanner bean = null;
+                        try {
+                            bean = new Gson().fromJson(array.getJSONObject(i).toString(),
+                                    new TypeToken<BeanBanner>() {
+                                    }.getType());
+                        } catch (JSONException e) {
+                            e.printStackTrace();
+                        }
+                        list.add(bean);
+                    }
+                }
+                callback.done(list, null);
+            }
+
+            @Override
+            public void onError(Response<String> response) {
+                super.onError(response);
+                LogUtil.e(ApiUtil.class, "onError getBannerDataMain:" + response.body());
+                LogUtil.e(ApiUtil.class, "onError getBannerDataMain:" + response.message());
+                if (callback != null) {
+                    callback.done(null, response.message());
+                }
+            }
+        });
+    }
+
+    //获取banner 热门
+    public static void getBannerDataHot(String id, final OnApiResponseCallback<List<BeanBanner>, String> callback) {
+        Map<String, String> map = new HashMap<>();
+        String url = TravelApi.QUERY_BANNER_HOT + id;
+        OkGoUtil.getMap(url, map, new StringCallback() {
+            @Override
+            public void onSuccess(Response<String> response) {
+
+                LogUtil.e(ApiUtil.class, "onSuccess getBannerDataHot:" + response.body());
+                if (callback == null) return;
+                String status = OkGoUtil.getStringToJson(response.body(), ApiKey.STATUS);
+                if (status == null) {
+                    callback.done(null, ApiKey.ERROR_NO_STATUS);
+                    return;
+                }
+                if (!status.equals(ApiKey.STATUS_200)) {
+                    callback.done(null, ApiKey.ERROR_PREFIX + "--status" + status + "--message" + OkGoUtil.getStringToJson(response.body(), ApiKey.MESSAGE));
+                    return;
+                }
+
+                JSONArray array = OkGoUtil.getListToJson(response.body(), ApiKey.DATA);
+                List<BeanBanner> list = new ArrayList<BeanBanner>();
+                if (array != null && array.length() > 0) {
+                    for (int i = 0; i < array.length(); i++) {
+                        BeanBanner bean = null;
+                        try {
+                            bean = new Gson().fromJson(array.getJSONObject(i).toString(),
+                                    new TypeToken<BeanBanner>() {
+                                    }.getType());
+                        } catch (JSONException e) {
+                            e.printStackTrace();
+                        }
+                        list.add(bean);
+                    }
+                }
+                callback.done(list, null);
+            }
+
+            @Override
+            public void onError(Response<String> response) {
+                super.onError(response);
+                LogUtil.e(ApiUtil.class, "onError getBannerDataHot:" + response.body());
+                LogUtil.e(ApiUtil.class, "onError getBannerDataHot:" + response.message());
+                if (callback != null) {
+                    callback.done(null, response.message());
+                }
+            }
+        });
+    }
+
+
+    //获取热门游 hot 0-否,1-是
+    public static void getHotData(String query, String page, String limit, final OnApiResponseCallback<List<BeanHot>, String> callback) {
+        Map<String, String> map = new HashMap<>();
+        map.put("hot", "1");
+        map.put("query", query);
+        map.put("page", page);
+        map.put("limit", limit);
+        OkGoUtil.getMap(TravelApi.QUERY_HOT_LIST, map, new StringCallback() {
+            @Override
+            public void onSuccess(Response<String> response) {
+
+                LogUtil.e(ApiUtil.class, "onSuccess getHotData:" + response.body());
+                if (callback == null) return;
+                String status = OkGoUtil.getStringToJson(response.body(), ApiKey.STATUS);
+                if (status == null) {
+                    callback.done(null, ApiKey.ERROR_NO_STATUS);
+                    return;
+                }
+                if (!status.equals(ApiKey.STATUS_200)) {
+                    callback.done(null, ApiKey.ERROR_PREFIX + "--status" + status + "--message" + OkGoUtil.getStringToJson(response.body(), ApiKey.MESSAGE));
+                    return;
+                }
+                JSONArray array = OkGoUtil.getListToJson(response.body(), ApiKey.DATA);
+                List<BeanHot> list = new ArrayList<BeanHot>();
+                if (array != null && array.length() > 0) {
+                    for (int i = 0; i < array.length(); i++) {
+                        BeanHot bean = null;
+                        try {
+                            bean = new Gson().fromJson(array.getJSONObject(i).toString(),
+                                    new TypeToken<BeanHot>() {
+                                    }.getType());
+                        } catch (JSONException e) {
+                            e.printStackTrace();
+                        }
+                        list.add(bean);
+                    }
+                }
+                callback.done(list, null);
+            }
+
+            @Override
+            public void onError(Response<String> response) {
+                super.onError(response);
+                LogUtil.e(ApiUtil.class, "onError getHotData:" + response.body());
+                LogUtil.e(ApiUtil.class, "onError getHotData:" + response.message());
+                if (callback != null) {
+                    callback.done(null, response.message());
+                }
+            }
+        });
+    }
+
+    //获取周边游
+    //latitudel=22.954205&longitude=113.879421
+    public static void getRimData(String tagId, String query, String page, String limit, final OnApiResponseCallback<List<BeanRim>, String> callback) {
+        Map<String, String> map = new HashMap<>();
+        map.put("tagId", tagId);
+        map.put("query", query);
+        map.put("page", page);
+        map.put("limit", limit);
+        map.put("latitudel", "22.954205");
+        map.put("longitude", "113.879421");
+        OkGoUtil.getMap(TravelApi.QUERY_RIM_LIST, map, new StringCallback() {
+            @Override
+            public void onSuccess(Response<String> response) {
+
+                LogUtil.e(ApiUtil.class, "onSuccess getRimData:" + response.body());
+
+                if (callback == null) return;
+                String status = OkGoUtil.getStringToJson(response.body(), ApiKey.STATUS);
+                if (status == null) {
+                    callback.done(null, ApiKey.ERROR_NO_STATUS);
+                    return;
+                }
+                if (!status.equals(ApiKey.STATUS_200)) {
+                    callback.done(null, ApiKey.ERROR_PREFIX + "--status" + status + "--message" + OkGoUtil.getStringToJson(response.body(), ApiKey.MESSAGE));
+                    return;
+                }
+                List<BeanRim> list = new ArrayList<BeanRim>();
+
+                JSONObject data = OkGoUtil.getJsonObjectToJson(response.body(), ApiKey.DATA);
+                if (data != null) {
+                    JSONArray array = OkGoUtil.getListToJson(data.toString(), ApiKey.DATA);
+                    if (array != null && array.length() > 0) {
+                        for (int i = 0; i < array.length(); i++) {
+                            BeanRim bean = null;
+                            try {
+                                bean = new Gson().fromJson(array.getJSONObject(i).toString(),
+                                        new TypeToken<BeanRim>() {
+                                        }.getType());
+                            } catch (JSONException e) {
+                                e.printStackTrace();
+                            }
+                            list.add(bean);
+                        }
+                    }
+                }
+                callback.done(list, null);
+            }
+
+            @Override
+            public void onError(Response<String> response) {
+                super.onError(response);
+                LogUtil.e(ApiUtil.class, "onError getRimData:" + response.body());
+                LogUtil.e(ApiUtil.class, "onError getRimData:" + response.message());
+                if (callback != null) {
+                    callback.done(null, response.message());
+                }
+            }
+        });
+    }
+
+    //获取出游人信息 0-儿童,1-成年人
+    public static void getTravelMember(String isChild, final OnApiResponseCallback<List<BeanTravelMember>, String> callback) {
+        Map<String, String> map = new HashMap<>();
+        //map.put("isChild", isChild);
+
+        String url = TravelApi.QUERY_TRAVEL_MEMBER + isChild;
+        OkGoUtil.getMap(url, map, new StringCallback() {
+            @Override
+            public void onSuccess(Response<String> response) {
+
+                LogUtil.e(ApiUtil.class, "onSuccess getTravelMember:" + response.body());
+
+                if (callback == null) return;
+                String status = OkGoUtil.getStringToJson(response.body(), ApiKey.STATUS);
+                if (status == null) {
+                    callback.done(null, ApiKey.ERROR_NO_STATUS);
+                    return;
+                }
+                if (!status.equals(ApiKey.STATUS_200)) {
+                    callback.done(null, ApiKey.ERROR_PREFIX + "--status" + status + "--message" + OkGoUtil.getStringToJson(response.body(), ApiKey.MESSAGE));
+                    return;
+                }
+
+                JSONArray array = OkGoUtil.getListToJson(response.body(), ApiKey.DATA);
+                List<BeanTravelMember> list = new ArrayList<BeanTravelMember>();
+                if (array != null && array.length() > 0) {
+                    for (int i = 0; i < array.length(); i++) {
+                        BeanTravelMember bean = null;
+                        try {
+                            bean = new Gson().fromJson(array.getJSONObject(i).toString(),
+                                    new TypeToken<BeanTravelMember>() {
+                                    }.getType());
+                        } catch (JSONException e) {
+                            e.printStackTrace();
+                        }
+                        list.add(bean);
+                    }
+                }
+                callback.done(list, null);
+
+            }
+
+            @Override
+            public void onError(Response<String> response) {
+                super.onError(response);
+                LogUtil.e(ApiUtil.class, "onError getTravelMember:" + response.body());
+                LogUtil.e(ApiUtil.class, "onError getTravelMember:" + response.message());
+                if (callback != null) {
+                    callback.done(null, response.message());
+                }
+            }
+        });
+    }
+
+    //确认下单
+    public static void commitOrder(
+            String contactEmail,
+            String contactMan,
+            String contactPhone,
+            String endAddr,
+            String endTime,
+            String goodId,
+            String myPassagerIds,
+            String speIds,
+            String spePriceId,
+            String startAddr,
+            String startCompanyId,
+            String startTime,
+            final OnApiResponseCallback<List<Boolean>, String> callback) {
+        Map<String, String> map = new HashMap<>();
+        map.put("contactEmail", contactEmail);
+        map.put("contactMan", contactMan);
+        map.put("contactPhone", contactPhone);
+        map.put("endAddr", endAddr);
+        map.put("endTime", endTime);
+        map.put("goodId", goodId);
+        map.put("myPassagerIds", myPassagerIds);
+        map.put("speIds", speIds);
+        map.put("spePriceId", spePriceId);
+        map.put("startAddr", startAddr);
+        map.put("startCompanyId", startCompanyId);
+        map.put("startTime", startTime);
+        String url = TravelApi.COMMIT_ORDER;
+        OkGoUtil.getMap(url, map, new StringCallback() {
+            @Override
+            public void onSuccess(Response<String> response) {
+
+                LogUtil.e(ApiUtil.class, "onSuccess commitOrder:" + response.body());
+
+                if (callback == null) return;
+                String status = OkGoUtil.getStringToJson(response.body(), ApiKey.STATUS);
+                if (status == null) {
+                    callback.done(null, ApiKey.ERROR_NO_STATUS);
+                    return;
+                }
+                if (!status.equals(ApiKey.STATUS_200)) {
+                    callback.done(null, ApiKey.ERROR_PREFIX + "--status" + status + "--message" + OkGoUtil.getStringToJson(response.body(), ApiKey.MESSAGE));
+                    return;
+                }
+
+
+            }
+
+            @Override
+            public void onError(Response<String> response) {
+                super.onError(response);
+                LogUtil.e(ApiUtil.class, "onError commitOrder:" + response.body());
+                LogUtil.e(ApiUtil.class, "onError commitOrder:" + response.message());
+                if (callback != null) {
+                    callback.done(null, response.message());
+                }
             }
         });
     }

RvTravel/src/main/java/com/rv/travel/api/OnApiResponseCallback.java

+package com.rv.travel.api;
+
+public interface OnApiResponseCallback<T,V> {
+    void done(T data, V errorMessage);
+}

RvTravel/src/main/java/com/rv/travel/api/TravelApi.java

@@ -3,10 +3,19 @@ package com.rv.travel.api;
 import com.frame.rv.RvFrameConfig;
 
 public interface TravelApi extends RvFrameConfig {
-    //查询公司详情
-    String QUERY_COMPANY_DETAIL = HOST + ADMIN_POST + "user/querUserBycode";
-    //查询Banner
-    String QUERY_BANNER = HOST + "/tourBanner/app/unauth/findBannerlist";
-    //周边游、推荐路线
+    //登录  参数拼接在url上然后 post 请求
+    String TRAVEL_LOGIN = HOST + "/api/auth/jwt/login";
+    //查询公司详情  直接 在url上 +/ +参数  get
+    String QUERY_COMPANY_DETAIL = HOST + "/vehicle/branchCompany/app/unauth/detail/";
+    //查询Banner get
+    String QUERY_BANNER_MAIN = HOST + "/api/tour/tourBanner/app/unauth/findBannerlist";
+    String QUERY_BANNER_HOT = HOST + "/api/tour/tourTagBanner/app/unauth/findById/";
+    //周边游、推荐路线 get  需要传query关键字，没有关键字就""
     String QUERY_RIM_LIST = HOST + "/api/tour/tourGood/app/unauth/getGoodList";
+    //热门游 路线 get
+    String QUERY_HOT_LIST = HOST + "/api/tour/tourTag/app/unauth/getTagList";
+    //获取旅游成员 直接 在url上 +/ +参数  get
+    String QUERY_TRAVEL_MEMBER = HOST + "/api/tour/tourUser/app/unauth/getTourUser/";
+    //确认下单
+    String COMMIT_ORDER = HOST + "/api/order/orderTour/add";
 }

RvTravel/src/main/java/com/rv/travel/bean/BeanBanner.java

+package com.rv.travel.bean;
+
+public class BeanBanner {
+    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;
+    }
+
+
+}

RvTravel/src/main/java/com/rv/travel/bean/BeanHot.java

 package com.rv.travel.bean;
 
 public class BeanHot {
+    private String id;// 1,
+    private String name;// "上海游",
+    private String describe;// "测试",
+    private String isHot;// 1,
+    private String count;// 0,
+    private String rank;// 1,
+    private String isDel;// 0
+
+    public String getImg() {
+        return img;
+    }
+
+    public void setImg(String img) {
+        this.img = img;
+    }
+
+    private String img;// 0
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDescribe() {
+        return describe;
+    }
+
+    public void setDescribe(String describe) {
+        this.describe = describe;
+    }
+
+    public String getIsHot() {
+        return isHot;
+    }
+
+    public void setIsHot(String isHot) {
+        this.isHot = isHot;
+    }
+
+    public String getCount() {
+        return count;
+    }
+
+    public void setCount(String count) {
+        this.count = count;
+    }
+
+    public String getRank() {
+        return rank;
+    }
+
+    public void setRank(String rank) {
+        this.rank = rank;
+    }
+
+    public String getIsDel() {
+        return isDel;
+    }
+
+    public void setIsDel(String isDel) {
+        this.isDel = isDel;
+    }
+
+
 }

RvTravel/src/main/java/com/rv/travel/bean/BeanLogin.java

+package com.rv.travel.bean;
+
+public class BeanLogin {
+
+//    {
+//        "data":{
+//        "nickname":"XX_414908",
+//                "headerurl":"https://xxtest.upyuns.com/image/app/default_%20avatar.png",
+//                "userid":27,
+//                "username":"13612688539"
+//    },
+//        "message":"操作成功",
+//            "status":200,
+//            "token":"eyJhbGciOiJSUzI1NiJ9.eyJzdWIiOiIxMzYxMjY4ODUzOSIsInVzZXJJZCI6IjI3IiwicmVxdWVzdFR5cGUiOiJBUFAiLCJleHAiOjE1NjAxNjMwMDN9.OgIQ7SjmX1DYzLDfsXcH-TUbKcatyEz7odkYFpTZ1wdxRB0iIrEKpXtC3zmf5VNDpaDc4cL-8XILiEfFVIGnfRKz4EDeXkFXVlBrqSORGm4TcqFu01aJ6xWVOmjSRkBp2gDhaGF-qOJXNK6Eufz90aF4t_CQ2tS7mG-UIVDty1s"
+//    }
+}

RvTravel/src/main/java/com/rv/travel/bean/BeanRim.java

 package com.rv.travel.bean;
 
 public class BeanRim {
+    private String id;//37,
+    private String name;//"04-05号 惠州长荣大观园2日游",
+    private String cover;//"https://xxtest.upyuns.com/image/app/ENRq748FQTq86R8R77J88YEWhnPeZ3.png",
+    private String price;//880,
+    private String childPrice;//500,
+    private String viewCount;//15,
+    private String saleCount;//6,
+    private String describe;//"",
+    private String content;//"
+    private String introduce;//
+    private String explain;//
+    private String rank;//8,
+    private String status;//1,
+    private String crtTime;//1556249282,
+    private String updTime;//1558418424,
+    private String recommend;//1,
+    private String isMember;//1,
+    private String stock;//44,
+    private String unit;//"元/人",
+    private String isDel;//0
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getCover() {
+        return cover;
+    }
+
+    public void setCover(String cover) {
+        this.cover = cover;
+    }
+
+    public String getPrice() {
+        return price;
+    }
+
+    public void setPrice(String price) {
+        this.price = price;
+    }
+
+    public String getChildPrice() {
+        return childPrice;
+    }
+
+    public void setChildPrice(String childPrice) {
+        this.childPrice = childPrice;
+    }
+
+    public String getViewCount() {
+        return viewCount;
+    }
+
+    public void setViewCount(String viewCount) {
+        this.viewCount = viewCount;
+    }
+
+    public String getSaleCount() {
+        return saleCount;
+    }
+
+    public void setSaleCount(String saleCount) {
+        this.saleCount = saleCount;
+    }
+
+    public String getDescribe() {
+        return describe;
+    }
+
+    public void setDescribe(String describe) {
+        this.describe = describe;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public String getIntroduce() {
+        return introduce;
+    }
+
+    public void setIntroduce(String introduce) {
+        this.introduce = introduce;
+    }
+
+    public String getExplain() {
+        return explain;
+    }
+
+    public void setExplain(String explain) {
+        this.explain = explain;
+    }
+
+    public String getRank() {
+        return rank;
+    }
+
+    public void setRank(String rank) {
+        this.rank = rank;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    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 getRecommend() {
+        return recommend;
+    }
+
+    public void setRecommend(String recommend) {
+        this.recommend = recommend;
+    }
+
+    public String getIsMember() {
+        return isMember;
+    }
+
+    public void setIsMember(String isMember) {
+        this.isMember = isMember;
+    }
+
+    public String getStock() {
+        return stock;
+    }
+
+    public void setStock(String stock) {
+        this.stock = stock;
+    }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
+    public String getIsDel() {
+        return isDel;
+    }
+
+    public void setIsDel(String isDel) {
+        this.isDel = isDel;
+    }
+
+
 }

RvTravel/src/main/java/com/rv/travel/fragment/AndroidInterface.java

+package com.rv.travel.fragment;
+
+import android.webkit.JavascriptInterface;
+
+import com.rv.travel.GoOtherUtil;
+
+/**
+ * Created by cenxiaozhong on 2017/5/14.
+ * source code  https://github.com/Justson/AgentWeb
+ */
+
+public class AndroidInterface {
+
+    private TravelWebFragment travelWebFragment;
+
+    public AndroidInterface(TravelWebFragment travelWebFragment) {
+        this.travelWebFragment = travelWebFragment;
+    }
+
+
+    @JavascriptInterface
+    public void showButton(String param) {
+        travelWebFragment.showButtonLayout();
+    }
+
+    @JavascriptInterface
+    public void readyOrder(String orderJson) {
+
+        //travelWebFragment.showToastLong("readyOrder:" + orderJson);
+        GoOtherUtil.goTravelCommitOrder(orderJson, travelWebFragment.getActivity());
+
+    }
+
+}

RvTravel/src/main/java/com/rv/travel/fragment/TravelFragmentCommitOrder.java

@@ -28,8 +28,10 @@ import butterknife.Unbinder;
 //确认下单
 public class TravelFragmentCommitOrder extends BaseFragment {
 
-    public static TravelFragmentCommitOrder getInstance() {
+    private String data= "";
+    public static TravelFragmentCommitOrder getInstance(String oderJson) {
         TravelFragmentCommitOrder instance = new TravelFragmentCommitOrder();
+        instance.data = oderJson;
         return instance;
     }
 

RvTravel/src/main/java/com/rv/travel/fragment/TravelFragmentHotMore.java

@@ -15,6 +15,8 @@ import com.rv.travel.adapter.AdapterHot;
 import com.rv.travel.R;
 import com.rv.travel.R2;
 import com.rv.travel.TravelActivity;
+import com.rv.travel.api.ApiUtil;
+import com.rv.travel.api.OnApiResponseCallback;
 import com.rv.travel.bean.BeanHot;
 
 import java.util.ArrayList;
@@ -89,26 +91,23 @@ public class TravelFragmentHotMore extends BaseFragment {
 
     private void setHot() {
         List<BeanHot> data = new ArrayList<>();
-        data.add(new BeanHot());
-        data.add(new BeanHot());
-        data.add(new BeanHot());
-        data.add(new BeanHot());
-        data.add(new BeanHot());
-        data.add(new BeanHot());
-        data.add(new BeanHot());
-        data.add(new BeanHot());
-        data.add(new BeanHot());
         adapterHot = new AdapterHot(R.layout.item_travel_hot_more, data);
         adapterHot.setOnItemRootClickListener(new AdapterHot.OnItemRootClickListener() {
             @Override
             public void onItemClick(BeanHot bean) {
-                TravelActivity.getInstance().setTravelFragmentHotType();
+                TravelActivity.getInstance().setHotTypeTitle(bean.getName());
+                TravelActivity.getInstance().setTravelFragmentHotType(bean);
             }
         });
         GridLayoutManager gridLayoutManager = new GridLayoutManager(baseContext, 3);
         hotRecycler.setLayoutManager(gridLayoutManager);
-
         hotRecycler.setAdapter(adapterHot);
+        ApiUtil.getHotData("1", "1", "50", new OnApiResponseCallback<List<BeanHot>, String>() {
+            @Override
+            public void done(List<BeanHot> data, String errorMessage) {
+                adapterHot.setNewData(data);
+            }
+        });
     }
 
 

RvTravel/src/main/java/com/rv/travel/fragment/TravelFragmentHotType.java

@@ -15,17 +15,18 @@ import android.widget.ImageView;
 
 import com.base.utils.base.BaseFragment;
 import com.base.utils.tools.android.IntentUtil;
-import com.frame.base.browse.ActivityImageBrowseInt;
+import com.frame.base.browse.ActivityImageBrowseUrl;
 import com.frame.base.glide.GlideManager;
 import com.rv.travel.GoOtherUtil;
 import com.rv.travel.R;
 import com.rv.travel.R2;
 import com.rv.travel.TravelActivity;
 import com.rv.travel.adapter.AdapterRim;
+import com.rv.travel.api.ApiUtil;
+import com.rv.travel.api.OnApiResponseCallback;
+import com.rv.travel.bean.BeanBanner;
+import com.rv.travel.bean.BeanHot;
 import com.rv.travel.bean.BeanRim;
-import com.rv.travel.other.OtherClickListener;
-import com.rv.travel.other.OtherOption;
-import com.rv.travel.other.TravelFragmentActivity;
 import com.yuyife.banner.Banner;
 import com.yuyife.banner.BannerConfig;
 import com.yuyife.banner.listener.OnBannerListener;
@@ -37,6 +38,7 @@ import java.util.List;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.Unbinder;
+
 //热门旅游 某个子栏目
 public class TravelFragmentHotType extends BaseFragment {
     @BindView(R2.id.travel_banner)
@@ -51,6 +53,14 @@ public class TravelFragmentHotType extends BaseFragment {
     @SuppressLint("StaticFieldLeak")
     public static FrameLayout hotMoreLayoutStatic;
 
+    public static TravelFragmentHotType getInstance(BeanHot beanHot) {
+        TravelFragmentHotType instance = new TravelFragmentHotType();
+        instance.currentBeanHot = beanHot;
+        return instance;
+    }
+
+    private BeanHot currentBeanHot = null;
+
 //    @OnClick({R2.id.travel_hot_more_image
 //    })
 //    public void onTravelFragmentHotTypeClick(View view) {
@@ -79,17 +89,27 @@ public class TravelFragmentHotType extends BaseFragment {
         onView();
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        TravelActivity.getInstance().setHotTypeTitle(currentBeanHot.getName());
+    }
 
     @Override
     public void onData() {
-
         setRim();
     }
 
     @Override
     public void onView() {
 
-        setBanner();
+        ApiUtil.getBannerDataHot(currentBeanHot.getId(), new OnApiResponseCallback<List<BeanBanner>, String>() {
+            @Override
+            public void done(List<BeanBanner> data, String errorMessage) {
+                setBanner(data);
+            }
+        });
+
     }
 
     @Override
@@ -103,66 +123,62 @@ public class TravelFragmentHotType extends BaseFragment {
     private void setRim() {
 
         List<BeanRim> data = new ArrayList<>();
-        data.add(new BeanRim());
-        data.add(new BeanRim());
-        data.add(new BeanRim());
-        data.add(new BeanRim());
-        data.add(new BeanRim());
-        data.add(new BeanRim());
-        data.add(new BeanRim());
-        data.add(new BeanRim());
-        data.add(new BeanRim());
         adapterRim = new AdapterRim(R.layout.item_travel_rim, data);
         adapterRim.setItemRootClickListener(new AdapterRim.OnItemRootClickListener() {
             @Override
             public void onItemClick(BeanRim bean) {
-                GoOtherUtil.goTravelDetailWeb(getActivity());
+                GoOtherUtil.goTravelDetailWeb(bean.getId(), getActivity());
             }
         });
         final LinearLayoutManager linearLayoutManager = new LinearLayoutManager(baseContext);
         linearLayoutManager.setOrientation(LinearLayoutManager.VERTICAL);
         rimRecycler.setLayoutManager(linearLayoutManager);
-
         rimRecycler.setAdapter(adapterRim);
 
+
+        ApiUtil.getRimData(currentBeanHot.getId(), "", "1", "50", new OnApiResponseCallback<List<BeanRim>, String>() {
+            @Override
+            public void done(List<BeanRim> data, String errorMessage) {
+                adapterRim.setNewData(data);
+            }
+        });
+
+
     }
 
 
     private ArrayList<String> images = new ArrayList<>();    //图片(默认采用网络地址)
     private List<String> titles = new ArrayList<>();         //图片标题
-    private List<Integer> localImages = new ArrayList<>();   //图片(本地资源)
+    //private List<Integer> localImages = new ArrayList<>();   //图片(本地资源)
 
-    private void setBanner() {
+    private void setBanner(List<BeanBanner> bannerData) {
         titles.clear();
         images.clear();
-        localImages.clear();
-
-        localImages.add(R.mipmap.banner_test3);
-        localImages.add(R.mipmap.banner_test4);
-
-        banner.setImages(localImages);
-        for (int i = 0; i < localImages.size(); i++) {
+        if (bannerData != null && bannerData.size() > 0) {
+            for (BeanBanner bean : bannerData) {
+                images.add(bean.getCover());
+            }
+            for (int i = 0; i < images.size(); i++) {
                 titles.add("");
             }
+        }
         banner.isAutoPlay(true)
+                .setImages(images)
                 .setBannerTitles(titles)
                 .setDelayTime(3000)
                 .setImageLoader(new ImageLoader() {
                     @Override
                     public void displayImage(Context context, Object path, ImageView imageView) {
-
                         GlideManager.getInstance(context).loadImage(path, imageView);
                     }
                 })
                 .setOnBannerListener(new OnBannerListener() {
                     @Override
                     public void OnBannerClick(int position) {
-                        if (localImages != null && localImages.size() > 0) {
                         Bundle bundle = new Bundle();
-                            bundle.putInt(ActivityImageBrowseInt.KEY_BACKGROUND, R.color.colorPrimary);
-                            bundle.putIntegerArrayList(ActivityImageBrowseInt.KEY_IMAGE, (ArrayList<Integer>) localImages);
-                            IntentUtil.startActivity(baseContext, ActivityImageBrowseInt.class, bundle);
-                        }
+                        bundle.putInt(ActivityImageBrowseUrl.KEY_BACKGROUND, R.color.colorPrimary);
+                        bundle.putStringArrayList(ActivityImageBrowseUrl.KEY_IMAGE, (ArrayList<String>) images);
+                        IntentUtil.startActivity(baseContext, ActivityImageBrowseUrl.class, bundle);
                     }
                 })
                 .start();

RvTravel/src/main/java/com/rv/travel/fragment/TravelFragmentMain.java

@@ -12,11 +12,13 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 
 import com.base.animset.util.NiftyEffects;
 import com.base.utils.base.BaseFragment;
 import com.base.utils.tools.android.IntentUtil;
-import com.frame.base.browse.ActivityImageBrowseInt;
+import com.base.utils.tools.android.KeyboardUtil;
+import com.base.utils.ui.datetime.selector.util.TextUtil;
 import com.frame.base.browse.ActivityImageBrowseUrl;
 import com.frame.base.glide.GlideManager;
 import com.rv.travel.GoOtherUtil;
@@ -26,6 +28,8 @@ import com.rv.travel.TravelActivity;
 import com.rv.travel.adapter.AdapterHot;
 import com.rv.travel.adapter.AdapterRim;
 import com.rv.travel.api.ApiUtil;
+import com.rv.travel.api.OnApiResponseCallback;
+import com.rv.travel.bean.BeanBanner;
 import com.rv.travel.bean.BeanHot;
 import com.rv.travel.bean.BeanRim;
 import com.yuyife.banner.Banner;
@@ -40,6 +44,7 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import butterknife.Unbinder;
+
 //主页面
 public class TravelFragmentMain extends BaseFragment {
     @BindView(R2.id.travel_banner)
@@ -50,6 +55,8 @@ public class TravelFragmentMain extends BaseFragment {
     RecyclerView rimRecycler;
     @BindView(R2.id.travel_fragment_hot_more_layout)
     FrameLayout hotMoreLayout;
+    @BindView(R2.id.query_layout)
+    LinearLayout queryLayout;
 
     @SuppressLint("StaticFieldLeak")
     public static FrameLayout hotMoreLayoutStatic;
@@ -89,6 +96,8 @@ public class TravelFragmentMain extends BaseFragment {
 
         setHot();
 
+        query = "";
+        isQueryMode = false;
         setRim();
     }
 
@@ -98,28 +107,38 @@ public class TravelFragmentMain extends BaseFragment {
         setBanner();
 
 
-        ApiUtil.getCompanyData();
+        ApiUtil.getCompanyData("2", new OnApiResponseCallback<List<BeanBanner>, String>() {
+            @Override
+            public void done(List<BeanBanner> data, String errorMessage) {
+
+            }
+        });
+
+
     }
 
     private AdapterHot adapterHot;
 
     private void setHot() {
         List<BeanHot> data = new ArrayList<>();
-        data.add(new BeanHot());
-        data.add(new BeanHot());
-        data.add(new BeanHot());
         adapterHot = new AdapterHot(R.layout.item_travel_hot, data);
         adapterHot.setOnItemRootClickListener(new AdapterHot.OnItemRootClickListener() {
             @Override
             public void onItemClick(BeanHot bean) {
-                TravelActivity.getInstance().setTravelFragmentHotType();
+
+                TravelActivity.getInstance().setTravelFragmentHotType(bean);
             }
         });
         LinearLayoutManager linearLayoutManager = new LinearLayoutManager(baseContext);
         linearLayoutManager.setOrientation(LinearLayoutManager.HORIZONTAL);
         hotRecycler.setLayoutManager(linearLayoutManager);
-
         hotRecycler.setAdapter(adapterHot);
+        ApiUtil.getHotData("1", "1", "50", new OnApiResponseCallback<List<BeanHot>, String>() {
+            @Override
+            public void done(List<BeanHot> data, String errorMessage) {
+                adapterHot.setNewData(data);
+            }
+        });
     }
 
     private AdapterRim adapterRim;
@@ -128,50 +147,64 @@ public class TravelFragmentMain extends BaseFragment {
 
 
         List<BeanRim> data = new ArrayList<>();
-        data.add(new BeanRim());
-        data.add(new BeanRim());
-        data.add(new BeanRim());
-        data.add(new BeanRim());
-        data.add(new BeanRim());
-        data.add(new BeanRim());
-        data.add(new BeanRim());
-        data.add(new BeanRim());
-        data.add(new BeanRim());
         adapterRim = new AdapterRim(R.layout.item_travel_rim, data);
         adapterRim.setItemRootClickListener(new AdapterRim.OnItemRootClickListener() {
             @Override
             public void onItemClick(BeanRim bean) {
-                GoOtherUtil.goTravelDetailWeb(getActivity());
-
+                GoOtherUtil.goTravelDetailWeb(bean.getId(), getActivity());
             }
         });
         final LinearLayoutManager linearLayoutManager = new LinearLayoutManager(baseContext);
         linearLayoutManager.setOrientation(LinearLayoutManager.VERTICAL);
         rimRecycler.setLayoutManager(linearLayoutManager);
-
         rimRecycler.setAdapter(adapterRim);
 
+        ApiUtil.getRimData("", query, "1", "50", new OnApiResponseCallback<List<BeanRim>, String>() {
+            @Override
+            public void done(List<BeanRim> data, String errorMessage) {
+                adapterRim.setNewData(data);
+            }
+        });
+
+        if (isQueryMode) {
+            queryLayout.setVisibility(View.GONE);
+        } else {
+            queryLayout.setVisibility(View.VISIBLE);
+        }
+    }
+
+    private String query = "";
+    private boolean isQueryMode = false;
+
+    public void getRimData(String queryInput) {
+        KeyboardUtil.hideKeyboard(getActivity());
+        query = queryInput;
+        isQueryMode = !TextUtil.isEmpty(query);
+        setRim();
     }
 
 
     private ArrayList<String> images = new ArrayList<>();    //图片(默认采用网络地址)
     private List<String> titles = new ArrayList<>();         //图片标题
-    private List<Integer> localImages = new ArrayList<>();   //图片(本地资源)
+    //private List<Integer> localImages = new ArrayList<>();   //图片(本地资源)
 
     private void setBanner() {
         titles.clear();
         images.clear();
-        localImages.clear();
-
-        localImages.add(R.mipmap.banner_test1);
-        localImages.add(R.mipmap.banner_test2);
+        //localImages.clear();
 
-        banner.setImages(localImages);
-        for (int i = 0; i < localImages.size(); i++) {
+        ApiUtil.getBannerDataMain(new OnApiResponseCallback<List<BeanBanner>, String>() {
+            @Override
+            public void done(List<BeanBanner> bannerData, String errorMessage) {
+                if (bannerData != null && bannerData.size() > 0) {
+                    for (BeanBanner bean : bannerData) {
+                        images.add(bean.getCover());
                         titles.add("");
                     }
+                }
                 banner.isAutoPlay(true)
                         .setBannerTitles(titles)
+                        .setImages(images)
                         .setDelayTime(3000)
                         .setImageLoader(new ImageLoader() {
                             @Override
@@ -183,18 +216,21 @@ public class TravelFragmentMain extends BaseFragment {
                         .setOnBannerListener(new OnBannerListener() {
                             @Override
                             public void OnBannerClick(int position) {
-                        if (localImages != null && localImages.size() > 0) {
+
                                 Bundle bundle = new Bundle();
-                            bundle.putInt(ActivityImageBrowseInt.KEY_BACKGROUND, R.color.colorPrimary);
-                            bundle.putIntegerArrayList(ActivityImageBrowseInt.KEY_IMAGE, (ArrayList<Integer>) localImages);
-                            IntentUtil.startActivity(baseContext, ActivityImageBrowseInt.class, bundle);
-                        }
+                                bundle.putInt(ActivityImageBrowseUrl.KEY_BACKGROUND, R.color.colorPrimary);
+                                bundle.putStringArrayList(ActivityImageBrowseUrl.KEY_IMAGE, (ArrayList<String>) images);
+                                IntentUtil.startActivity(baseContext, ActivityImageBrowseUrl.class, bundle);
+
                             }
                         })
                         .start();
 
                 banner.updateBannerStyle(BannerConfig.CIRCLE_INDICATOR);
             }
+        });
+
+    }
 
 
     private TravelFragmentHotMore travelFragmentHotMore;

RvTravel/src/main/java/com/rv/travel/fragment/TravelWebFragment.java

@@ -7,20 +7,17 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
+import android.widget.LinearLayout;
 
 import com.base.utils.base.BaseFragment;
-import com.base.utils.tools.android.IntentUtil;
 import com.just.agentweb.AgentWeb;
-import com.rv.travel.GoOtherUtil;
 import com.rv.travel.R;
 import com.rv.travel.R2;
-import com.rv.travel.other.OtherClickListener;
-import com.rv.travel.other.OtherOption;
-import com.rv.travel.other.TravelFragmentActivity;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.Unbinder;
+
 //旅游详情
 public class TravelWebFragment extends BaseFragment {
 
@@ -33,16 +30,29 @@ public class TravelWebFragment extends BaseFragment {
     private String URL_ADDRESS = "";
     @BindView(R2.id.travel_web_fragment_root)
     FrameLayout rootLayout;
+    @BindView(R2.id.travel_web_button_layout)
+    LinearLayout buttonLayout;
+
+    public void showButtonLayout() {
+        buttonLayout.setVisibility(View.VISIBLE);
+    }
 
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_web, container, false);
         unbinder = ButterKnife.bind(this, view);
-        view.findViewById(R.id.travel_web_go_order).setOnClickListener(new View.OnClickListener() {
+        view.findViewById(R.id.travel_web_service_button).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                //showToastShort("联系客服");
+            }
+        });
+        view.findViewById(R.id.travel_web_subscribe_button).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-               GoOtherUtil.goTravelCommitOrder(getActivity());
+                //buttonLayout.setVisibility(View.INVISIBLE);
+                mAgentWeb.getJsAccessEntrace().quickCallJs("openModal");
             }
         });
         return view;
@@ -62,7 +72,6 @@ public class TravelWebFragment extends BaseFragment {
     public void onData() {
 
 
-
     }
 
     @Override
@@ -87,31 +96,8 @@ public class TravelWebFragment extends BaseFragment {
                 .createAgentWeb()
                 .ready()
                 .go(URL_ADDRESS);
-    }
-
-    /**
-     * 准备确认订单
-     * @param company  公司名
-     * @param address  公司地址
-     * @param aim      目的地
-     * @param startDate  开始日期
-     * @param endDate    结束日期
-     * @param startWeek  开始的星期
-     * @param endWeek    结束的星期
-     * */
-    public void readyOrder(String company,
-                           String address,
-                           String aim,
-                           String startDate,
-                           String endDate,
-                           String startWeek,
-                           String endWeek){
-
-        GoOtherUtil.goTravelCommitOrder(getActivity());
-
-    }
 
-    public void readyOrder(String orderJson){
+        mAgentWeb.getJsInterfaceHolder().addJavaObject("android", new AndroidInterface(this));
 
     }
 }

RvTravel/src/main/res/layout/activity_travel.xml

@@ -127,6 +127,7 @@
                 android:orientation="horizontal">
 
                 <TextView
+                    android:id="@+id/travel_type_text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/ui_dimen_margin_h2"

RvTravel/src/main/res/layout/fragment_travel_mian.xml

@@ -16,6 +16,12 @@
             android:orientation="vertical">
 
 
+            <LinearLayout
+                android:id="@+id/query_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
                 <android.support.v7.widget.CardView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -90,14 +96,16 @@
                         android:paddingLeft="5dp"
                         android:scaleType="center" />
                 </LinearLayout>
+            </LinearLayout>
+
 
             <android.support.v7.widget.RecyclerView
                 android:id="@+id/travel_rim_recycler"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/ui_dimen_margin_h1"
-                android:layout_marginRight="@dimen/ui_dimen_margin_h1"
-                android:layout_marginTop="@dimen/ui_dimen_common" />
+                android:layout_marginTop="@dimen/ui_dimen_common"
+                android:layout_marginRight="@dimen/ui_dimen_margin_h1" />
 
 
         </LinearLayout>

RvTravel/src/main/res/layout/fragment_web.xml

@@ -6,14 +6,57 @@
     <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/travel_web_fragment_root"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:layout_marginBottom="@dimen/_ui_height_h3" />
+
 
-    </FrameLayout>
+    <LinearLayout
+        android:id="@+id/travel_web_button_layout"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/_ui_height_h3"
+        android:layout_gravity="bottom"
+        android:background="@color/colorTop"
+        android:orientation="horizontal">
 
-    <Button
-        android:id="@+id/travel_web_go_order"
+        <LinearLayout
+            android:id="@+id/travel_web_service_button"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:clickable="true"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <TextView
                 android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|center"
-        android:text="确认下单" />
+                android:layout_height="match_parent"
+                android:layout_marginLeft="@dimen/ui_dimen_margin_h1"
+                android:layout_marginRight="@dimen/ui_dimen_margin_h1"
+                android:drawableLeft="@drawable/rv_rentingcar_icon_service_dark"
+                android:drawablePadding="@dimen/ui_dimen_padding_h1"
+                android:gravity="center"
+                android:lines="1"
+                android:text="联系客服"
+                android:textColor="@color/colorTextH1"
+                android:textSize="@dimen/_ui_text_size_h5" />
+        </LinearLayout>
+
+
+        <TextView
+            android:id="@+id/travel_web_subscribe_button"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_margin="@dimen/ui_dimen_common"
+            android:layout_weight="1"
+            android:background="@drawable/ui_shape_radius_common_primary_h1"
+            android:clickable="true"
+            android:gravity="center"
+            android:lines="1"
+            android:text="立即预约"
+            android:textColor="@color/colorTop"
+            android:textSize="@dimen/_ui_text_size_h3" />
+
+
+    </LinearLayout>
+
 </FrameLayout>
\ No newline at end of file

RvTravel/src/main/res/layout/item_include_hot.xml

@@ -4,12 +4,14 @@
     android:layout_height="match_parent">
 
     <ImageView
+        android:id="@+id/item_hot_bg_img"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scaleType="centerCrop"
         android:src="@mipmap/banner_test4" />
 
     <TextView
+        android:id="@+id/item_hot_text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"

RvTravel/src/main/res/layout/item_travel_rim.xml

@@ -32,6 +32,7 @@
                 app:cardElevation="0dp">
 
                 <ImageView
+                    android:id="@+id/item_rim_image"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:scaleType="centerCrop"
@@ -46,6 +47,7 @@
                 android:orientation="vertical">
 
                 <TextView
+                    android:id="@+id/item_rim_title"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:lines="2"
@@ -54,6 +56,7 @@
                     android:textSize="@dimen/_ui_text_size_h6" />
 
                 <TextView
+                    android:id="@+id/item_rim_address"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/ui_dimen_margin_h1"
@@ -72,13 +75,21 @@
                     android:layout_marginTop="@dimen/ui_dimen_common"
                     android:orientation="horizontal">
 
+                    <TextView
+                        android:id="@+id/item_rim_stock"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:lines="1"
+                        android:paddingLeft="@dimen/ui_dimen_common"
+                        android:text="20"
+                        android:textColor="@color/colorTextH1"
+                        android:textSize="@dimen/_ui_text_size_h8" />
                     <TextView
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:lines="1"
-                        android:paddingLeft="@dimen/ui_dimen_common"
-                        android:text="20人待出发"
+                        android:text="人待出发"
                         android:textColor="@color/colorTextH1"
                         android:textSize="@dimen/_ui_text_size_h8" />
 
@@ -91,6 +102,7 @@
                         android:textSize="@dimen/_ui_text_size_h3" />
 
                     <TextView
+                        android:id="@+id/item_rim_price"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:lines="1"
@@ -99,6 +111,7 @@
                         android:textSize="@dimen/_ui_text_size_h3" />
 
                     <TextView
+                        android:id="@+id/item_rim_price_unit"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:lines="1"