Merge remote-tracking branch 'origin/master-invoice' into master-invoice

MyFrame/src/main/java/com/frame/base/url/ImageUrl.java

@@ -8,4 +8,7 @@ public final class ImageUrl {
     public static final String IMG_BG_BANNER_SIGN = "https://mgmt.dfangche.com/image/app/banner_sign.png";
 
     public static final String IMG_BG_LOGO = "https://mgmt.dfangche.com/image/admin/2019-11-27/66.png";
+
+
+    public static final String IMG_APP_BG_ACTIVITY_50 = "https://mgmt.dfangche.com/image/app/activity_50.png";
 }

RvClient/src/main/java/com/xxfc/rv/MainActivity.java

@@ -32,7 +32,9 @@ import android.widget.Toast;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.base.utils.tools.android.NetworkUtil;
 import com.base.utils.ui.image.round.RoundImageView;
+import com.bumptech.glide.Glide;
 import com.frame.base.url.Constance;
+import com.frame.base.url.ImageUrl;
 import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.MessageEventLogout;
 import com.ruiwenliu.wrapper.MessageEventRemoteLogin;
@@ -52,6 +54,7 @@ import com.ruiwenliu.wrapper.util.GpsManager;
 import com.ruiwenliu.wrapper.util.UtilsManager;
 import com.ruiwenliu.wrapper.util.ViewHolder;
 import com.ruiwenliu.wrapper.util.glide.GlideManager;
+import com.ruiwenliu.wrapper.util.glide.GlideOptions;
 import com.ruiwenliu.wrapper.util.listener.SwitchFragment;
 import com.ruiwenliu.wrapper.weight.CustomScrollViewPager;
 import com.ruiwenliu.wrapper.weight.TitleView;
@@ -79,6 +82,7 @@ import com.rv.im.xmpp.listener.ChatMessageListener;
 import com.rv.plugin.calendar.bean.PreRentDaysBean;
 import com.rv.rvmine.MineFragment;
 import com.rv.share.WebViewActivity;
+import com.rv.share.utils.TransformationUtils;
 import com.rv.share.view.PromotionDialog;
 import com.rv.tourism.R2;
 import com.rv.tourism.TourismFragment;
@@ -719,24 +723,28 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements DownL
         if (codeInfoBean == null || codeInfoBean.getData() == null) {
             return;
         }
-
         new ConferenceEventDialog(mActivity) {
             @Override
             public void helper(ViewHolder helper) {
                 super.helper(helper);
                 GlideManager.getInstance(MainActivity.this).loadImage(codeInfoBean.getData().getHeadimgurl(), (RoundImageView) helper.getView(R.id.iv_avatar));
-                helper.setText(R.id.tv_name, codeInfoBean.getData().getNickname() + "邀请一起参加");
+                helper.setText(R.id.tv_name, "#" + codeInfoBean.getData().getNickname() + "#邀请一起参加");
+                GlideOptions options = GlideOptions.placeholderOf(com.ruiwenliu.wrapper.R.drawable.glide_icon_placeholder).
+                        error(com.ruiwenliu.wrapper.R.drawable.glide_icon_error);
+
+                Glide.with(MainActivity.this)
+                        .asBitmap()
+                        .load(ImageUrl.IMG_APP_BG_ACTIVITY_50)
+                        .apply(options)
+                        .into(new TransformationUtils((ImageView) helper.getView(R.id.img_bg)));
+
                 helper.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
                         int i = v.getId();
                         if (i == R.id.tv_item_check) {
                             //查看活动判断
-                            if (TextUtils.isEmpty(OkGoUtil.getToken())) {
-                                ARouter.getInstance().build(Constance.ACTIVITY_URL_LOGINRV).navigation();
-                                return;
-                            }
-                            startActivity(WebViewActivity.getIntent(getApplicationContext(), "https://xxtest.upyuns.com/h5/appHtml/view/newYear/index.html", "发布会"));
+                            startActivity(WebViewActivity.getIntent(getApplicationContext(), ApiConfig.HTTP_URL_NEWYEAR_INDEX, "发布会"));
                             dismiss();
                         } else if (i == R.id.img_item_close) {
                             dismiss();

component_dialog/src/main/res/layout/rv_dialog_conference_event.xml

@@ -25,9 +25,7 @@
             <com.base.utils.ui.image.round.RoundImageView
                 android:id="@+id/iv_avatar"
                 android:layout_width="@dimen/size_30"
-                android:layout_height="@dimen/size_30"
-                android:background="@drawable/shape_rv_bg_shallow_dark_yellow_circle" />
-
+                android:layout_height="@dimen/size_30" />
 
             <TextView
                 android:id="@+id/tv_name"
@@ -46,7 +44,6 @@
             android:layout_marginLeft="@dimen/size_10"
             android:layout_marginTop="@dimen/size_20"
             android:layout_marginRight="@dimen/size_10"
-            android:background="@color/gray_47E270"
             android:minWidth="@dimen/size_150"
             android:minHeight="@dimen/size_150" />
 

module_camp/src/main/java/com/rv/camp/CampFragment.java

@@ -11,7 +11,6 @@ import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.EditText;
 
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.baidu.location.BDAbstractLocationListener;
@@ -200,7 +199,7 @@ public class CampFragment extends BaseFragment<CampPresenter> implements BaseQui
             isOpen = true;
         } else if (id == R.id.ll_item_search) {
 
-            startActivity(CampSearchActivity.getIntent(_mActivity));
+            startActivity(CampSearchActivity.getIntent(_mActivity, latLatitude, lonLongitude));
         }
     }
 

module_camp/src/main/java/com/rv/camp/camp/CampSearchActivity.java

@@ -10,7 +10,9 @@ import android.text.TextUtils;
 import android.view.View;
 import android.widget.EditText;
 
+import com.alibaba.android.arouter.launcher.ARouter;
 import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.frame.base.url.Constance;
 import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseStatusActivity;
@@ -45,9 +47,13 @@ public class CampSearchActivity extends BaseStatusActivity<CampPresenter> implem
     private int mPage;
     private int countPage;
     private String content;
+    private double latLatitude = 0;
+    private double lonLongitude;
 
-    public static Intent getIntent(Context context) {
-        return new Intent(context, CampSearchActivity.class);
+    public static Intent getIntent(Context context, double latLatitude, double lonLongitude) {
+        return new Intent(context, CampSearchActivity.class)
+                .putExtra("latLatitude", latLatitude)
+                .putExtra("lonLongitude", lonLongitude);
     }
 
     @Override
@@ -59,6 +65,9 @@ public class CampSearchActivity extends BaseStatusActivity<CampPresenter> implem
     protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
         showTitle(false);
 
+        latLatitude = intent.getDoubleExtra("latLatitude", 0);
+        lonLongitude = intent.getDoubleExtra("lonLongitude", 0);
+
         campAdapter = new CampListAdapter();
         rvContent.setItemAnimator(null);
         rvContent.setLayoutManager(new GridLayoutManager(mActivity, 2));
@@ -67,6 +76,19 @@ public class CampSearchActivity extends BaseStatusActivity<CampPresenter> implem
         rvContent.setAdapter(campAdapter);
         campAdapter.setEmptyView(getEmptyView(rvContent, -1, "还没有营地信息！"));
 
+        campAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                CampListBean.DataBeanX.DataBean data = (CampListBean.DataBeanX.DataBean) adapter.getItem(position);
+                ARouter.getInstance()
+                        .build(Constance.ACTIVITY_URL_CAMPDETAIL)
+                        .withString("id", data.getId())
+                        .withDouble("longitude", lonLongitude)
+                        .withDouble("latitude", latLatitude)
+                        .navigation();
+            }
+        });
+
         campAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
             @Override
             public void onLoadMoreRequested() {

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

@@ -184,4 +184,9 @@ public class ApiConfig {
      * 根据code获取信息
      */
     public static String HTTP_URL_UNAUTH_CODE = RvFrameConfig.HOST + "/api/admin/app/user/app/unauth/code/";
+
+    /**
+     * 发布会活动
+     */
+    public static String HTTP_URL_NEWYEAR_INDEX = RvFrameConfig.HOST_H5_DETAIL + "/h5/appHtml/view/newYear/index.html";
 }

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

@@ -38,31 +38,36 @@ public class CompletedAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
         switch (helper.getItemViewType()) {
             case TYPE_FOR_PAYMENT:
                 OrderListBean.DataBeanX.DataBean dataBean = (OrderListBean.DataBeanX.DataBean) item;
-                if (dataBean ==null){
+                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) {
+                if (dataBean.getOrderRentVehicleDetail() != null && dataBean.getOrderRentVehicleDetail().getStart_city_name() != null) {
                     helper.setText(R.id.tv_city, dataBean.getOrderRentVehicleDetail().getStart_city_name());
                 }
-                if (dataBean.getStatusX() ==6){
+                if (dataBean.getStatusX() == 6) {
                     helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_completed));
-                }else if (dataBean.getStatusX() ==-1){
+                } else if (dataBean.getStatusX() == -1) {
                     helper.setText(R.id.tv_order_state, "定损中");
                 }
 
-                String icon ="";
-                if (!TextUtils.isEmpty(dataBean.getCoverPic())){
+                String icon = "";
+                if (!TextUtils.isEmpty(dataBean.getCoverPic())) {
                     icon = dataBean.getCoverPic();
-                }else {
+                } else {
                     icon = dataBean.getIcon();
                 }
                 helper.loadRoundImage(mContext, icon, (ImageView) helper.getView(R.id.iv_goods), 8);
                 helper.setText(R.id.tv_car_type, dataBean.getName());
-                if (dataBean.getOrderRentVehicleDetail() !=null) {
+                if (dataBean.getOrderRentVehicleDetail() != null) {
                     helper.setText(R.id.tv_get_time, DateUtils.timestampToString1(dataBean.getOrderRentVehicleDetail().getStart_time()));
                     helper.setText(R.id.tv_get_address, dataBean.getOrderRentVehicleDetail().getStart_addr());
-                    helper.setText(R.id.tv_out_time, DateUtils.timestampToString1(dataBean.getOrderRentVehicleDetail().getEnd_time()));
+
+                    if (dataBean.getOrderRentVehicleDetail().getDelayAddEndTime() > 0) {
+                        helper.setText(R.id.tv_out_time, DateUtils.timestampToString1(dataBean.getOrderRentVehicleDetail().getDelayAddEndTime()));
+                    } else {
+                        helper.setText(R.id.tv_out_time, DateUtils.timestampToString1(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.getRealAmount()));
@@ -74,7 +79,7 @@ public class CompletedAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
                 if (dataBean2 == null) {
                     return;
                 }
-                if (dataBean2.getOrderTourDetail() ==null ){
+                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()));
@@ -82,7 +87,7 @@ public class CompletedAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
                 helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_completed));
                 helper.loadRoundImage(mContext, dataBean2.getPicture(), (ImageView) helper.getView(R.id.iv_goods), 8);
                 helper.setText(R.id.tv_car_type, dataBean2.getName());
-                helper.setText(R.id.tv_out_time, mContext.getString(R.string.rv_to_time) +DateUtils.timestampToString1(dataBean2.getOrderTourDetail().getStartTime()));
+                helper.setText(R.id.tv_out_time, mContext.getString(R.string.rv_to_time) + DateUtils.timestampToString1(dataBean2.getOrderTourDetail().getStartTime()));
                 helper.setText(R.id.tv_count_person, String.format("%1$s%2$s", mContext.getString(R.string.rv_to_person), dataBean2.getOrderTourDetail().getTotalNumber(), mContext.getString(R.string.rv_person)));
                 helper.setText(R.id.tv_price, String.format("¥%1$s", dataBean2.getRealAmount()));
                 helper.setText(R.id.tv_camp_process, mContext.getString(R.string.rv_to_evaluation));
@@ -90,10 +95,10 @@ public class CompletedAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
                 break;
             case TYPE_TO_MEMBER:
                 OrderListBean.DataBeanX.DataBean dataBean3 = (OrderListBean.DataBeanX.DataBean) item;
-                if (dataBean3 ==null){
+                if (dataBean3 == null) {
                     return;
                 }
-                if (dataBean3.getOrderMemberDetail() ==null){
+                if (dataBean3.getOrderMemberDetail() == null) {
                     return;
                 }
 
@@ -101,9 +106,9 @@ public class CompletedAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
                 helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_completed));
                 helper.loadRoundImage(mContext, dataBean3.getPicture(), (ImageView) helper.getView(R.id.iv_goods), 8);
                 helper.setText(R.id.tv_name, dataBean3.getName());
-                helper.setText(R.id.tv_content,dataBean3.getOrderMemberDetail().getContent() );
+                helper.setText(R.id.tv_content, dataBean3.getOrderMemberDetail().getContent());
                 helper.setText(R.id.tv_price, String.format("¥%1$s", dataBean3.getRealAmount()));
-                helper.setVisible(R.id.tv_member_pay,false);
+                helper.setVisible(R.id.tv_member_pay, false);
 //                helper.setText(R.id.tv_member_pay, mContext.getString(R.string.rv_to_pay_for));
 //                helper.addOnClickListener(R.id.tv_member_pay);
                 break;

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

@@ -49,7 +49,7 @@ public class ForPaymentAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity
                 if (dataBean == null) {
                     return;
                 }
-                setTimes(AppCookie.getLongValue( "actRent"), helper, (OrderListBean.DataBeanX.DataBean) item);
+                setTimes(AppCookie.getLongValue("actRent"), helper, (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()));
                 if (dataBean.getOrderRentVehicleDetail() != null && dataBean.getOrderRentVehicleDetail().getStart_city_name() != null) {
                     helper.setText(R.id.tv_city, dataBean.getOrderRentVehicleDetail().getStart_city_name());
@@ -68,7 +68,12 @@ public class ForPaymentAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity
                 if (dataBean.getOrderRentVehicleDetail() != null) {
                     helper.setText(R.id.tv_get_time, DateUtils.timestampToString1(dataBean.getOrderRentVehicleDetail().getStart_time()));
                     helper.setText(R.id.tv_get_address, dataBean.getOrderRentVehicleDetail().getStart_addr());
-                    helper.setText(R.id.tv_out_time, DateUtils.timestampToString1(dataBean.getOrderRentVehicleDetail().getEnd_time()));
+
+                    if (dataBean.getOrderRentVehicleDetail().getDelayAddEndTime() > 0) {
+                        helper.setText(R.id.tv_out_time, DateUtils.timestampToString1(dataBean.getOrderRentVehicleDetail().getDelayAddEndTime()));
+                    } else {
+                        helper.setText(R.id.tv_out_time, DateUtils.timestampToString1(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.getRealAmount()));
                 }
@@ -83,7 +88,7 @@ public class ForPaymentAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity
                 if (dataBean.getOrderTourDetail() == null) {
                     return;
                 }
-                setTimes(AppCookie.getLongValue( "actTour"), helper, (OrderListBean.DataBeanX.DataBean) item);
+                setTimes(AppCookie.getLongValue("actTour"), helper, (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.getOrderTourDetail().getStartCityName());
                 helper.loadRoundImage(mContext, dataBean.getPicture(), (ImageView) helper.getView(R.id.iv_goods), 8);
@@ -157,10 +162,10 @@ public class ForPaymentAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity
         @Override
         public void onTimeFinish(RecyclerView.ViewHolder holder) {
             if (holder != null) {
-                if(getData().size() == 1){
+                if (getData().size() == 1) {
                     getData().remove(holder.getAdapterPosition());
                     notifyDataSetChanged();
-                }else{
+                } else {
                     getData().remove(holder.getAdapterPosition());
                     notifyItemRemoved(holder.getAdapterPosition());
                 }

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

@@ -21,9 +21,9 @@ import java.util.List;
  * Desc:已出行
  */
 
-public class HaveToTravelAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,BaseGlideHolder> {
-    public static final int TYPE_FOR_PAYMENT=1;
-    public static final int TYPE_TO_TRAVEL=2;
+public class HaveToTravelAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity, BaseGlideHolder> {
+    public static final int TYPE_FOR_PAYMENT = 1;
+    public static final int TYPE_TO_TRAVEL = 2;
     public static final int TYPE_TO_MEMBER = 3;
 
     public HaveToTravelAdapter(List<MultiItemEntity> data) {
@@ -35,34 +35,39 @@ public class HaveToTravelAdapter extends BaseMultiItemQuickAdapter<MultiItemEnti
 
     @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;
-                if (dataBean ==null){
+                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_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_have_travel));
+                helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_have_travel));
 
-                String icon ="";
-                if (!TextUtils.isEmpty(dataBean.getCoverPic())){
+                String icon = "";
+                if (!TextUtils.isEmpty(dataBean.getCoverPic())) {
                     icon = dataBean.getCoverPic();
-                }else {
+                } else {
                     icon = dataBean.getIcon();
                 }
-                helper.loadRoundImage(mContext,icon, (ImageView) helper.getView(R.id.iv_goods),8);
-                helper.setText(R.id.tv_car_type,dataBean.getName());
-                if (dataBean.getOrderRentVehicleDetail() !=null) {
+                helper.loadRoundImage(mContext, icon, (ImageView) helper.getView(R.id.iv_goods), 8);
+                helper.setText(R.id.tv_car_type, dataBean.getName());
+                if (dataBean.getOrderRentVehicleDetail() != null) {
                     helper.setText(R.id.tv_get_time, DateUtils.timestampToString1(dataBean.getOrderRentVehicleDetail().getStart_time()));
                     helper.setText(R.id.tv_get_address, dataBean.getOrderRentVehicleDetail().getStart_addr());
-                    helper.setText(R.id.tv_out_time, DateUtils.timestampToString1(dataBean.getOrderRentVehicleDetail().getEnd_time()));
+
+                    if (dataBean.getOrderRentVehicleDetail().getDelayAddEndTime() > 0) {
+                        helper.setText(R.id.tv_out_time, DateUtils.timestampToString1(dataBean.getOrderRentVehicleDetail().getDelayAddEndTime()));
+                    } else {
+                        helper.setText(R.id.tv_out_time, DateUtils.timestampToString1(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.getRealAmount()));
-                helper.setText(R.id.tv_process,mContext.getString(R.string.rv_to_out_car));
+                helper.setText(R.id.tv_price, String.format("¥%1$s", dataBean.getRealAmount()));
+                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:
@@ -70,18 +75,18 @@ public class HaveToTravelAdapter extends BaseMultiItemQuickAdapter<MultiItemEnti
                 if (dataBean2 == null) {
                     return;
                 }
-                if (dataBean2.getOrderTourDetail() ==null ){
+                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, dataBean2.getOrderTourDetail().getStartCityName());
-                helper.setText(R.id.tv_order_state,mContext.getString(R.string.rv_order_have_travel));
-                helper.loadRoundImage(mContext,dataBean2.getPicture(), (ImageView) helper.getView(R.id.iv_goods),8);
-                helper.setText(R.id.tv_car_type,dataBean2.getName());
-                helper.setText(R.id.tv_out_time, mContext.getString(R.string.rv_to_time) +DateUtils.timestampToString1( dataBean2.getOrderTourDetail().getStartTime()));
+                helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_have_travel));
+                helper.loadRoundImage(mContext, dataBean2.getPicture(), (ImageView) helper.getView(R.id.iv_goods), 8);
+                helper.setText(R.id.tv_car_type, dataBean2.getName());
+                helper.setText(R.id.tv_out_time, mContext.getString(R.string.rv_to_time) + DateUtils.timestampToString1(dataBean2.getOrderTourDetail().getStartTime()));
                 helper.setText(R.id.tv_count_person, String.format("%1$s%2$s", mContext.getString(R.string.rv_to_person), dataBean2.getOrderTourDetail().getTotalNumber(), mContext.getString(R.string.rv_person)));
                 helper.setText(R.id.tv_price, String.format("¥%1$s", dataBean2.getRealAmount()));
-                helper.setVisible(R.id.tv_camp_process,false);
+                helper.setVisible(R.id.tv_camp_process, false);
 //                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(mContext.getString(R.string.rv_to_pay_for))?false:true);
@@ -89,7 +94,7 @@ public class HaveToTravelAdapter extends BaseMultiItemQuickAdapter<MultiItemEnti
         }
     }
 
-    public void addNewData(OrderListBean bean){
+    public void addNewData(OrderListBean bean) {
         mData.clear();
         addData(bean.getData().getData());
         notifyDataSetChanged();

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

@@ -61,7 +61,11 @@ public class OrderListAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
                 if (dataBean.getOrderRentVehicleDetail() != null) {
                     helper.setText(R.id.tv_get_time, DateUtils.timestampToString1(dataBean.getOrderRentVehicleDetail().getStart_time()));
                     helper.setText(R.id.tv_get_address, dataBean.getOrderRentVehicleDetail().getStart_addr());
-                    helper.setText(R.id.tv_out_time, DateUtils.timestampToString1(dataBean.getOrderRentVehicleDetail().getEnd_time()));
+                    if (dataBean.getOrderRentVehicleDetail().getDelayAddEndTime() > 0) {
+                        helper.setText(R.id.tv_out_time, DateUtils.timestampToString1(dataBean.getOrderRentVehicleDetail().getDelayAddEndTime()));
+                    } else {
+                        helper.setText(R.id.tv_out_time, DateUtils.timestampToString1(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.getRealAmount()));
@@ -92,7 +96,7 @@ public class OrderListAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
                         helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_for_payment));
                         helper.setText(R.id.tv_process, mContext.getString(R.string.rv_to_pay_for));
                         helper.setVisible(R.id.tv_process, true);
-                        setTimes(AppCookie.getLongValue( "actRent"), helper, (OrderListBean.DataBeanX.DataBean) item);
+                        setTimes(AppCookie.getLongValue("actRent"), helper, (OrderListBean.DataBeanX.DataBean) item);
                         break;
                     case 4:
                         helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_to_travel));
@@ -283,10 +287,10 @@ public class OrderListAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
         @Override
         public void onTimeFinish(RecyclerView.ViewHolder holder) {
             if (holder != null) {
-                if(getData().size() == 1){
+                if (getData().size() == 1) {
                     getData().remove(holder.getAdapterPosition());
                     notifyDataSetChanged();
-                }else{
+                } else {
                     getData().remove(holder.getAdapterPosition());
                     notifyItemRemoved(holder.getAdapterPosition());
                 }

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

@@ -57,7 +57,12 @@ public class ToTravelAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
                 if (dataBean.getOrderRentVehicleDetail() != null) {
                     helper.setText(R.id.tv_get_time, DateUtils.timestampToString1(dataBean.getOrderRentVehicleDetail().getStart_time()));
                     helper.setText(R.id.tv_get_address, dataBean.getOrderRentVehicleDetail().getStart_addr());
-                    helper.setText(R.id.tv_out_time, DateUtils.timestampToString1(dataBean.getOrderRentVehicleDetail().getEnd_time()));
+
+                    if (dataBean.getOrderRentVehicleDetail().getDelayAddEndTime() > 0) {
+                        helper.setText(R.id.tv_out_time, DateUtils.timestampToString1(dataBean.getOrderRentVehicleDetail().getDelayAddEndTime()));
+                    } else {
+                        helper.setText(R.id.tv_out_time, DateUtils.timestampToString1(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.getRealAmount()));

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/bean/OrderListBean.java

@@ -407,7 +407,7 @@ public class OrderListBean extends BaseBean implements Serializable {
                 private int endCity;
                 private int freeDays;
                 private double rebate;
-
+                private long delayAddEndTime;
 
                 public int getFreeDays() {
                     return freeDays;
@@ -602,6 +602,13 @@ public class OrderListBean extends BaseBean implements Serializable {
                 }
 
 
+                public long getDelayAddEndTime() {
+                    return delayAddEndTime;
+                }
+
+                public void setDelayAddEndTime(long delayAddEndTime) {
+                    this.delayAddEndTime = delayAddEndTime;
+                }
             }
 
             public static class OrderTourDetail implements Serializable {

plugin_member/src/main/java/com/rv.member/adapter/ConsumeRecordListAdapter.java

@@ -28,6 +28,7 @@ public class ConsumeRecordListAdapter extends BaseQuickAdapter<OrderListBean.Dat
     }
 
 
+
     @Override
     protected void convert(BaseViewHolder helper, final OrderListBean.DataBeanX.DataBean bean) {
 
@@ -44,7 +45,7 @@ public class ConsumeRecordListAdapter extends BaseQuickAdapter<OrderListBean.Dat
                     helper.setText(R.id.tv_state, "出行中");
                 } else if (bean.getStatusX() == 6) {
                     helper.setText(R.id.tv_state, "已完成");
-                }else if (bean.getStatusX() == -1){
+                } else if (bean.getStatusX() == -1) {
                     helper.setText(R.id.tv_state, "定损中");
                 }
                 if (!TextUtils.isEmpty(bean.getName())) {
@@ -54,10 +55,10 @@ public class ConsumeRecordListAdapter extends BaseQuickAdapter<OrderListBean.Dat
 
                 if (!TextUtils.isEmpty(bean.getPicture())) {
                     ImageView imgCarType = helper.itemView.findViewById(R.id.img_car_type);
-                    String icon ="";
-                    if (!TextUtils.isEmpty(bean.getCoverPic())){
+                    String icon = "";
+                    if (!TextUtils.isEmpty(bean.getCoverPic())) {
                         icon = bean.getCoverPic();
-                    }else {
+                    } else {
                         icon = bean.getIcon();
                     }
                     GlideManager.getInstance(mContext).loadImage(icon, imgCarType);
@@ -67,7 +68,13 @@ public class ConsumeRecordListAdapter extends BaseQuickAdapter<OrderListBean.Dat
             if (vehicleDetail != null) {
                 helper.setText(R.id.tv_location, vehicleDetail.getStart_city_name() + "-" + vehicleDetail.getEnd_city_name());
                 helper.setText(R.id.tv_get_info, DateUtils.timestampToString1(vehicleDetail.getStart_time()) + " " + vehicleDetail.getStart_addr());
-                helper.setText(R.id.tv_return_info, DateUtils.timestampToString1(vehicleDetail.getEnd_time()) + " " + vehicleDetail.getEnd_addr());
+
+                if (vehicleDetail.getDelayAddEndTime() > 0) {
+                    helper.setText(R.id.tv_return_info, DateUtils.timestampToString1(vehicleDetail.getDelayAddEndTime()) + " " + vehicleDetail.getEnd_addr());
+                } else {
+                    helper.setText(R.id.tv_return_info, DateUtils.timestampToString1(vehicleDetail.getEnd_time()) + " " + vehicleDetail.getEnd_addr());
+                }
+
                 if (vehicleDetail.getFreeDays() > 0) {
                     helper.setText(R.id.tv_member_right, "免费" + vehicleDetail.getFreeDays() + "天");
                     helper.setVisible(R.id.tv_member_right, true);

plugin_share/src/main/java/com/rv/share/WebViewActivity.java

@@ -50,6 +50,7 @@ public class WebViewActivity extends BaseStatusActivity<WebViewPresenter> {
         return R.layout.activity_web_view;
     }
 
+
     @Override
     protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
         titleView.setVisibility(View.GONE);
@@ -62,6 +63,11 @@ public class WebViewActivity extends BaseStatusActivity<WebViewPresenter> {
         ivTitleLeft.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                if (rvWebView.canGoBack()) {
+                    //返回上一个页
+                    rvWebView.goBack();
+                    return;
+                }
                 finish();
             }
         });
@@ -88,6 +94,16 @@ public class WebViewActivity extends BaseStatusActivity<WebViewPresenter> {
 
     }
 
+    @Override
+    public void onBackPressedSupport() {
+        if (rvWebView.canGoBack()) {
+            //返回上一个页
+            rvWebView.goBack();
+            return;
+        }
+        super.onBackPressedSupport();
+    }
+
     @Override
     public void onDestroy() {
         if (rvWebView != null) {