bug修复

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

@@ -23,4 +23,6 @@ public final class Constance {
     public static final String ACTIVITY_URL_TRAVELSEARCH ="/rv/search/TravelSearchActivity";
 
     public static final String ACTIVITY_URL_WEBVIEW ="/module/basic/WebActivity";
+
+    public static final String ACTIVITY_URL_CARDETAILMAP ="/main/home/CarDetailMapActivity";
 }

RvClient/build.gradle

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

RvWrapper/src/main/java/com/ruiwenliu/wrapper/http/OkHttpCreate.java

@@ -120,7 +120,6 @@ public class OkHttpCreate {
         int cacheSize = 10 * 1024 * 1024;
         Cache cache = new Cache(httpCacheDirectory, cacheSize);
         builder.cache(cache);
-
         return this;
     }
 

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

@@ -113,8 +113,8 @@ public class CampFragment extends BaseFragment<CampPresenter> implements BaseQui
                 ARouter.getInstance()
                         .build(Constance.ACTIVITY_URL_CAMPDETAIL)
                         .withString("id", data.getId())
-                        .withString("longitude", String.valueOf(lonLongitude))
-                        .withString("latitude",String.valueOf(latLatitude))
+                        .withDouble("longitude", lonLongitude)
+                        .withDouble("latitude",latLatitude)
                         .navigation();
             }
         });

module_camp/src/main/java/com/rv/camp/api/CampApi.java

@@ -12,4 +12,7 @@ public interface CampApi extends RvFrameConfig {
     //营地详情H5
     String TRAVEL_CAMPSITEDETAI = HOST + "/h5/appHtml/view/campsiteDetail.html";
 
+    //营地详情
+    String TRAVEL_UNAUTH_SHOP = HOST + "/api/campsite/campsiteShop/app/unauth/shop";
+
 }

module_camp/src/main/java/com/rv/camp/bean/CampDetailsBean.java

+package com.rv.camp.bean;
+
+import com.ruiwenliu.wrapper.base.BaseBean;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 营地列表
+ */
+
+public class CampDetailsBean extends BaseBean {
+
+    private DataBean data;
+    private int code;
+
+    public DataBean getData() {
+        return data;
+    }
+
+    public void setData(DataBean data) {
+        this.data = data;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public static class DataBean implements Serializable {
+        private String name;// ":"asdf",---->店铺名
+        private String address;//":"广东省广州市aasdfasdf",
+        private String phone;
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public String getAddress() {
+            return address;
+        }
+
+        public void setAddress(String address) {
+            this.address = address;
+        }
+
+        public String getPhone() {
+            return phone;
+        }
+
+        public void setPhone(String phone) {
+            this.phone = phone;
+        }
+    }
+}

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

 package com.rv.camp.camp;
 
 import android.annotation.TargetApi;
-import android.content.ClipboardManager;
-import android.content.Context;
 import android.content.Intent;
+import android.net.Uri;
 import android.os.Build;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.util.Log;
+import android.view.View;
 import android.webkit.JavascriptInterface;
 import android.webkit.WebChromeClient;
 import android.webkit.WebResourceRequest;
@@ -17,19 +16,25 @@ import android.webkit.WebViewClient;
 
 import com.alibaba.android.arouter.facade.annotation.Autowired;
 import com.alibaba.android.arouter.facade.annotation.Route;
+import com.alibaba.android.arouter.launcher.ARouter;
 import com.frame.base.url.Constance;
+import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.weight.TitleView;
 import com.rv.camp.R;
 import com.rv.camp.R2;
 import com.rv.camp.api.CampApi;
-import com.rv.camp.bean.CampListBean;
-import com.rv.camp.bean.CampTypeBean;
+import com.rv.camp.bean.CampDetailsBean;
 import com.rv.camp.presenter.CampPresenter;
 import com.yuyife.okgo.OkGoUtil;
 
+import java.util.LinkedHashMap;
+import java.util.Map;
+
 import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
 
 import static com.ruiwenliu.wrapper.weight.webview.SafeWebView.hasKitkat;
 
@@ -46,9 +51,10 @@ public class CampDetailActivity extends BaseStatusActivity<CampPresenter> {
     @Autowired()
     String id;
     @Autowired()
-    String longitude;
+    double longitude;
     @Autowired()
-    String latitude;
+    double latitude;
+    private CampDetailsBean data;
 
 
     @Override
@@ -59,16 +65,34 @@ public class CampDetailActivity extends BaseStatusActivity<CampPresenter> {
     @Override
     protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
         titleView.setTitle("营地详情");
-        webUrl = CampApi.TRAVEL_CAMPSITEDETAI + "?id=" + id +"&longitude=" + longitude +"&latitude=" +latitude;
-        Log.i("CampDetailActivity", "initView: " +webUrl);
+        webUrl = CampApi.TRAVEL_CAMPSITEDETAI + "?id=" + id + "&longitude=" + longitude + "&latitude=" + latitude;
+        Log.i("CampDetailActivity", "initView: " + webUrl);
         initWeb();
     }
 
+
     @Override
-    public void onShowResult(int requestType, BaseBean result) {
+    protected void loadData(Bundle savedInstanceState, Intent intent) {
+        super.loadData(savedInstanceState, intent);
+        loadDetail();
+    }
 
+    private void loadDetail() {
+        Map<String, Object> map = new LinkedHashMap<>();
+        map.put("id", id);
+        map.put("longitude", longitude);
+        map.put("latitude", latitude);
+        mPresenter.getData(RvFrameConfig.HOST, 0, CampApi.TRAVEL_UNAUTH_SHOP, CampDetailsBean.class, map, false);
     }
 
+    @Override
+    public void onShowResult(int requestType, BaseBean result) {
+        resultData((CampDetailsBean) result);
+    }
+
+    private void resultData(CampDetailsBean data) {
+        this.data = data;
+    }
 
     @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
     private void initWeb() {
@@ -127,13 +151,47 @@ public class CampDetailActivity extends BaseStatusActivity<CampPresenter> {
         });
     }
 
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        // TODO: add setContentView(...) invocation
+        ButterKnife.bind(this);
+    }
+
+    @OnClick(R2.id.tv_scheduled_camp)
+    public void onViewClicked(View view) {
+        int id = view.getId();
+        if (id == R.id.tv_scheduled_camp){
+            Intent intent = new Intent(Intent.ACTION_DIAL);
+            Uri uri = Uri.parse("tel:" + data.getData().getPhone());
+            intent.setData(uri);
+            startActivity(intent);
+        }
+    }
+
     public class AndroidJs {
         @JavascriptInterface
         public String getToken() {
             return OkGoUtil.getToken();
         }
-    }
 
+        /**
+         * 显示门店地图
+         */
+        @JavascriptInterface
+        public void showMap() {
+            if (data != null && data.getData() != null) {
+                ARouter.getInstance()
+                        .build(Constance.ACTIVITY_URL_CARDETAILMAP)
+                        .withString("addrDetail", data.getData().getAddress())
+                        .withString("phone", data.getData().getPhone())
+                        .withString("name", data.getData().getName())
+                        .withDouble("latitude", latitude)
+                        .withDouble("longitude", longitude)
+                        .navigation();
+            }
+        }
+    }
 
 
     @Override

module_home/build.gradle

@@ -15,9 +15,10 @@ android {
 
             annotationProcessorOptions {
 
-                arguments = [moduleName :project.getName() ]
+                arguments = [moduleName: project.getName()]
 
-            } }
+            }
+        }
 
     }
 
@@ -44,7 +45,7 @@ dependencies {
     api project(':plugin_calendar')
     api project(':RvWrapper')
 //    api project(':RvTravel')
-    annotationProcessor'com.alibaba:arouter-compiler:1.1.4'
+    annotationProcessor 'com.alibaba:arouter-compiler:1.1.4'
     implementation 'com.alibaba:fastjson:1.2.21'
 
 

module_home/src/main/AndroidManifest.xml

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

module_home/src/main/java/com/rv/home/rv/module/basic/BaseStatusActivity.java

@@ -7,13 +7,19 @@ import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.alibaba.fastjson.JSON;
+import com.base.utils.ui.datetime.selector.util.TextUtil;
 import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.R;
+import com.ruiwenliu.wrapper.SPConstance;
 import com.ruiwenliu.wrapper.base.swipe.SwipeBackActivity;
 import com.ruiwenliu.wrapper.inter.OnViewHolder;
 import com.ruiwenliu.wrapper.presenter.MvpPresenter;
+import com.ruiwenliu.wrapper.util.UtilsManager;
 import com.ruiwenliu.wrapper.util.ViewHolder;
+import com.rv.home.rv.module.basic.bean.BeanUserInfo;
 import com.rv.home.rv.module.ui.login.LoginRvActivity;
+import com.yuyife.okgo.OkGoUtil;
 
 /**
  * Created by ruiwen
@@ -143,4 +149,13 @@ public abstract class BaseStatusActivity<P extends MvpPresenter> extends SwipeBa
         });
     }
 
+    protected  BeanUserInfo.UserInfo getUserInfo(){
+        BeanUserInfo.UserInfo userInfo = null;
+        String spStringCode = UtilsManager.getInstance(OkGoUtil.application).getSPStringCode(SPConstance.USER_JSON, SPConstance.USER_JSON_USERINFO);
+        if (!TextUtil.isEmpty(spStringCode)) {
+           userInfo = JSON.parseObject(spStringCode, BeanUserInfo.UserInfo.class);
+        }
+        return userInfo;
+    }
+
 }

module_home/src/main/java/com/rv/home/rv/module/ui/login/RegisteredActivity.java

@@ -13,6 +13,8 @@ import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.alibaba.android.arouter.launcher.ARouter;
+import com.frame.base.url.Constance;
 import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.util.RxJavaManager;
@@ -139,7 +141,11 @@ public class RegisteredActivity extends BaseLoginActivity<CommonPresenter> {
             ivClearAgainPwd.setSelected(confirmShow);
             etAgainPwd.setTransformationMethod(confirmShow ? HideReturnsTransformationMethod.getInstance() : PasswordTransformationMethod.getInstance());
         } else if (view.getId() == R.id.tv_agreement) {
-
+            ARouter.getInstance().build(Constance.ACTIVITY_URL_WEBVIEW)
+                    .withString("title","用户协议")
+                    .withString("url",ApiConfig.HTTP_URL_CAR_TYPE_NOTICE)
+                    .withInt("type",15)
+                    .navigation();
         } else if (view.getId() == R.id.tv_registered) {
             if (getPwd().length() < 8) {
                 showToast(mActivity.getString(R.string.rv_pwd_length));

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/CarDetailActivity.java

@@ -16,6 +16,8 @@ import android.webkit.WebView;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.alibaba.android.arouter.launcher.ARouter;
+import com.frame.base.url.Constance;
 import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.util.um.CustomShareListener;
@@ -25,6 +27,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.bean.BeanUserInfo;
 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.bean.CarTypeListBean;
@@ -175,13 +178,19 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
             if (shareManager != null) {
                 shareManager.open();
             }
-        }
-        else if(view.getId()==R.id.tv_appointment){
+        } else if(view.getId()==R.id.tv_appointment){
             if (TextUtils.isEmpty( OkGoUtil.getToken())) {
                 RvFrameConfig.RvFrameInfo.TYPE_LOGIN = 1;
                 startActivity(LoginRvActivity.getIntent(mActivity));
                 return;
             }
+            BeanUserInfo.UserInfo userInfo = getUserInfo();
+            if (userInfo !=null){
+                if (userInfo.getCertificationStatus() ==0){
+                    showToast("亲，你还没有实名认证！");
+                    return;
+                }
+            }
             startActivity(ConfirmOrderActivity.getIntent(mActivity, dataBean, mCarBean, getIntent().getStringExtra("startTime"), getIntent().getStringExtra("endTime")));
             finish();
         }
@@ -304,7 +313,14 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
         @JavascriptInterface
         public void showMap() {
             if (mCarBean != null) {
-                startActivity(CarDetailMapActivity.getIntent(mActivity, mCarBean));
+                ARouter.getInstance()
+                        .build(Constance.ACTIVITY_URL_CARDETAILMAP)
+                        .withString("addrDetail",mCarBean.getCompany().getAddrDetail())
+                        .withString("phone",mCarBean.getCompany().getPhone())
+                        .withString("name",mCarBean.getCompany().getName())
+                        .withDouble("latitude",mCarBean.getCompany().getLatitude())
+                        .withDouble("longitude",mCarBean.getCompany().getLongitude())
+                        .navigation();
             }
 
         }

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/CarDetailMapActivity.java

@@ -9,6 +9,8 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import com.alibaba.android.arouter.facade.annotation.Autowired;
+import com.alibaba.android.arouter.facade.annotation.Route;
 import com.baidu.location.BDAbstractLocationListener;
 import com.baidu.location.BDLocation;
 import com.baidu.mapapi.map.BaiduMap;
@@ -22,6 +24,7 @@ import com.baidu.mapapi.map.MarkerOptions;
 import com.baidu.mapapi.map.MyLocationData;
 import com.baidu.mapapi.map.OverlayOptions;
 import com.baidu.mapapi.model.LatLng;
+import com.frame.base.url.Constance;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.swipe.SwipeBackActivity;
 import com.ruiwenliu.wrapper.util.LocationManager;
@@ -44,6 +47,7 @@ import butterknife.OnClick;
  * Date: 2019/6/5.
  * Desc:详情地图
  */
+@Route(path = Constance.ACTIVITY_URL_CARDETAILMAP)
 public class CarDetailMapActivity extends SwipeBackActivity<CommonPresenter> {
 
 
@@ -63,14 +67,21 @@ public class CarDetailMapActivity extends SwipeBackActivity<CommonPresenter> {
     RelativeLayout rlNavigation;
     @BindView(R2.id.ll_visible)
     LinearLayout llVisible;
-    private CarTypeListBean.DataBeanX.DataBean dataBean;
     private LocationManager locationManager;
     BaiduMap mBaiduMap;
     boolean isFirstLoc = true; // 是否首次定位
-    public static Intent getIntent(Context context, CarTypeListBean.DataBeanX.DataBean carBean) {
-        return new Intent(context, CarDetailMapActivity.class)
-                .putExtra("carBean", carBean);
-    }
+
+    @Autowired()
+    String addrDetail;
+    @Autowired()
+    String phone;
+    @Autowired()
+    String name;
+    @Autowired()
+    double latitude;
+    @Autowired()
+    double longitude;
+
 
     @Override
     protected int setLayout() {
@@ -79,13 +90,13 @@ public class CarDetailMapActivity extends SwipeBackActivity<CommonPresenter> {
 
     @Override
     protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
-        dataBean = (CarTypeListBean.DataBeanX.DataBean) intent.getSerializableExtra("carBean");
         titleView.setTitle(mActivity.getString(R.string.rv_shop_map));
         showTitle(false);
         initMap();
-        tvAddress.setText(String.format("%1$s%2$s", "地址：", dataBean.getCompany().getAddrDetail()));
-        tvPhone.setText(String.format("%1$s%2$s", "联系电话：",dataBean.getCompany().getPhone()));
-        tvName.setText(dataBean.getCompany().getName());
+
+        tvAddress.setText(String.format("%1$s%2$s", "地址：", addrDetail));
+        tvPhone.setText(String.format("%1$s%2$s", "联系电话：", phone));
+        tvName.setText(name);
     }
 
     @Override
@@ -132,33 +143,16 @@ public class CarDetailMapActivity extends SwipeBackActivity<CommonPresenter> {
 
     @OnClick({R2.id.iv_back, R2.id.iv_location, R2.id.rl_navigation})
     public void onViewClicked(View view) {
-        if(view.getId()==R.id.iv_back){
+        if (view.getId() == R.id.iv_back) {
             finish();
-        }else if(view.getId()==R.id.iv_location){
+        } else if (view.getId() == R.id.iv_location) {
             if (locationManager != null) {
                 locationManager.startLocation();
             }
-        }else if(view.getId()==R.id.rl_navigation){
-            if (dataBean != null) {
-                    showPickerDialog(new LatLng(dataBean.getCompany().getLatitude(),dataBean.getCompany().getLongitude()), dataBean.getCompany().getAddrDetail());
-                }
+        } else if (view.getId() == R.id.rl_navigation) {
+            showPickerDialog(new LatLng(latitude, longitude), addrDetail);
+
         }
-//        switch (view.getId()) {
-//            case R.id.iv_back:
-//                finish();
-//                break;
-//            case R.id.iv_location:
-//                if (locationManager != null) {
-//                    locationManager.startLocation();
-//                }
-//                break;
-//            case R.id.rl_navigation:
-//                if (dataBean != null) {
-//                    showPickerDialog(new LatLng(dataBean.getCompany().getLatitude(),dataBean.getCompany().getLongitude()), dataBean.getCompany().getAddrDetail());
-//                }
-//
-//                break;
-//        }
     }
 
     /**
@@ -184,6 +178,7 @@ public class CarDetailMapActivity extends SwipeBackActivity<CommonPresenter> {
         });
 
     }
+
     /**
      * 更新地图
      *
@@ -213,10 +208,10 @@ public class CarDetailMapActivity extends SwipeBackActivity<CommonPresenter> {
                 .longitude(location.getLongitude()).build();
 
         mBaiduMap.setMyLocationData(locData);
-        if (isFirstLoc && dataBean!=null) {
+        if (isFirstLoc ) {
             isFirstLoc = false;
             mBaiduMap.addOverlay(getMark());
-            updateMap(new LatLng(dataBean.getCompany().getLatitude(), dataBean.getCompany().getLongitude()));
+            updateMap(new LatLng(latitude, longitude));
 
         }
     }
@@ -228,16 +223,17 @@ public class CarDetailMapActivity extends SwipeBackActivity<CommonPresenter> {
      */
     private OverlayOptions getMark() {
         //定义Maker坐标点
-        LatLng point = new LatLng(dataBean.getCompany().getLatitude(), dataBean.getCompany().getLongitude());
+        LatLng point = new LatLng(latitude, longitude);
 //构建Marker图标
         BitmapDescriptor bitmap = BitmapDescriptorFactory
                 .fromResource(R.drawable.rv_map_shop);
         return new MarkerOptions()
                 .position(point)
-                .title(dataBean.getCompany().getName())
+                .title(name)
                 .icon(bitmap)
                 .animateType(MarkerOptions.MarkerAnimateType.drop);
     }
+
     /**
      * 显示地图弹窗
      */
@@ -252,28 +248,15 @@ public class CarDetailMapActivity extends SwipeBackActivity<CommonPresenter> {
                     @Override
                     public void onClick(View v) {
 
-                        if(v.getId()==R.id.btn_camera){
+                        if (v.getId() == R.id.btn_camera) {
                             MapUtil.getInstance(mActivity).goToBaiduMap(latLng, address, false);
                             dismiss();
-                        }else if(v.getId()==R.id.btn_album){
+                        } else if (v.getId() == R.id.btn_album) {
                             MapUtil.getInstance(mActivity).goToGaodeMap(latLng, address, true);
                             dismiss();
-                        }else if(v.getId()==R.id.btn_cancel){
+                        } else if (v.getId() == R.id.btn_cancel) {
                             dismiss();
                         }
-//                        switch (v.getId()) {
-//                            case R.id.btn_camera:
-//                                MapUtil.getInstance(mActivity).goToBaiduMap(latLng, address, false);
-//                                dismiss();
-//                                break;
-//                            case R.id.btn_album:
-//                                MapUtil.getInstance(mActivity).goToGaodeMap(latLng, address, true);
-//                                dismiss();
-//                                break;
-//                            case R.id.btn_cancel:
-//                                dismiss();
-//                                break;
-//                        }
 
                     }
                 }, R.id.btn_camera, R.id.btn_album, R.id.btn_cancel);
@@ -282,5 +265,4 @@ public class CarDetailMapActivity extends SwipeBackActivity<CommonPresenter> {
     }
 
 
-
 }

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/ConfirmOrderActivity.java

@@ -471,7 +471,7 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
      * 支付价格计算
      */
     private void getPayMoney() {
-        if (priceBean.getData() ==null){
+        if (priceBean !=null && priceBean.getData() ==null){
             return;
         }
         ArrayList<OrderPriceDetailBean.ChildrenBean> childrenBeanList = new ArrayList<>(); //费用明细

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/HomeFragment.java

@@ -289,7 +289,8 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
         //房车发烧友
         mRvEnthusiast = new RVEnthusiastAdapter();
         recyclerViewRvEnthusiast.setLayoutManager(new GridLayoutManager(getContext(), 2));
-        recyclerViewRvEnthusiast.addItemDecoration(new AbSpacesItemDecoration(10));// 分割线。
+//      recyclerViewRvEnthusiast.addItemDecoration(new AbSpacesItemDecoration(10));// 分割线。
+        recyclerViewRvEnthusiast.addItemDecoration(new flow(10));
         recyclerViewRvEnthusiast.setNestedScrollingEnabled(false);
         recyclerViewRvEnthusiast.setAdapter(mRvEnthusiast);
 
@@ -395,6 +396,30 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
         }
     }
 
+    public class flow extends RecyclerView.ItemDecoration {
+
+        private int space;
+
+        public flow(int space) {
+            this.space = space;
+        }
+
+        @Override
+        public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
+            super.getItemOffsets(outRect,view,parent,state);
+            if (parent.getChildAdapterPosition(view) % 2 ==0){
+                outRect.top = 40;
+            }else {
+                outRect.top = space;
+            }
+
+            outRect.bottom = space;
+
+            outRect.left = space;
+            outRect.right = space;
+        }
+    }
+
     private void getData() {
         List<String> list = new ArrayList<>();
         for (int i = 0; i < 5; i++) {

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

@@ -42,6 +42,7 @@ public class CancelTheTripActivity extends BaseStatusActivity<PickerPresenter> {
     RecyclerView mRecyclerView;
     private CancelTheTripAdapter mAdapter;
     private String no;
+    private TipsDialog dialog;
 
     public static Intent getIntent(Context context, String no) {
         return new Intent(context, CancelTheTripActivity.class).putExtra("no", no);
@@ -53,6 +54,7 @@ public class CancelTheTripActivity extends BaseStatusActivity<PickerPresenter> {
             case 0:
                 RxBus.post(new CancelOrderEvent());
                 finish();
+                showToast("取消成功！");
                 break;
         }
     }
@@ -100,6 +102,7 @@ public class CancelTheTripActivity extends BaseStatusActivity<PickerPresenter> {
                             mapHead.put("Authorization",  OkGoUtil.getToken());
 
                             mPresenter.postBodyData(RvFrameConfig.VEHICLE_ORDER, 0, ApiConfig.HTTP_URL_BASEORDER_CANCEL + no, CancelTheTripBean.class, new cancelReasonBean(mAdapter.getSelectName()), mapHead, true);
+                            dismiss();
                         }else if (id ==R.id.tv_cancel ) {
                             dismiss();
                         }

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

@@ -92,6 +92,8 @@ public class ForPaymentFragment extends BaseFragment<CommonPresenter> implements
                     startActivityForResult(OrderDetailActivity.getIntent(_mActivity, dataBean), 1);
                 }else if (2== dataBean.getType()){
                     startActivityForResult(TravelOrderDetailsActivity.getIntent(_mActivity, dataBean), 2);
+                }else if (3 == dataBean.getType()){
+
                 }
             }
         });

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

+package com.rv.home.rv.module.ui.main.home.order;
+
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.View;
+import android.webkit.WebView;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.ruiwenliu.wrapper.base.BaseBean;
+import com.ruiwenliu.wrapper.base.BaseStatusActivity;
+import com.ruiwenliu.wrapper.weight.TitleView;
+import com.rv.home.R;
+import com.rv.home.R2;
+import com.rv.home.rv.module.basic.presenter.PickerPresenter;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
+/**
+ * 会员订单详情
+ */
+public class MemberOrderDetailsActivity extends BaseStatusActivity<PickerPresenter> {
+
+    @BindView(R2.id.tv_center)
+    TextView tvCenter;
+    @BindView(R2.id.lay_title)
+    RelativeLayout layTitle;
+    @BindView(R2.id.webView)
+    WebView mWebView;
+    @BindView(R2.id.ll_item_bottom)
+    LinearLayout llItemBottom;
+
+    @Override
+    protected int setLayout() {
+        return R.layout.activity_member_order_details;
+    }
+
+    @Override
+    protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
+        showTitle(false);
+    }
+
+    @Override
+    public void onShowResult(int requestType, BaseBean result) {
+
+    }
+
+    @OnClick({R2.id.iv_back, R2.id.iv_customer_service, R2.id.tv_cancel_order, R2.id.tv_pay})
+    public void onViewClicked(View view) {
+        int id = view.getId();
+        if (id == R.id.iv_back){
+            finish();
+        }else if (id == R.id.iv_customer_service){
+
+        }else if (id == R.id.tv_cancel_order){
+
+        }else if (id == R.id.tv_pay){
+
+        }
+    }
+
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mWebView.onResume();// 生命周期onResume
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        mWebView.onPause();//生命周期onPause
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        mWebView.stopLoading();// 停止当前加载
+        mWebView.clearMatches();// 清除网页查找的高亮匹配字符。
+        mWebView.clearHistory();// 清除当前 WebView 访问的历史记录
+        mWebView.clearSslPreferences();//清除ssl信息
+        mWebView.clearCache(true);//清空网页访问留下的缓存数据。需要注意的时，由于缓存是全局的，所以只要是WebView用到的缓存都会被清空，即便其他地方也会使用到。该方法接受一个参数，从命名即可看出作用。若设为false，则只清空内存里的资源缓存，而不清空磁盘里的。
+        mWebView.loadUrl("about:blank");// 清空当前加载
+        mWebView.removeAllViews();// 清空子 View
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR2) {
+            mWebView.removeJavascriptInterface("AndroidNative");// 向 Web端注入 java 对象
+        }
+//        mWebView.addJavascriptInterface(new AndroidJs(),"AndroidJs");
+        mWebView.destroy();// 生命周期销毁
+
+    }
+}

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

@@ -419,11 +419,8 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
         }
 
         @JavascriptInterface
-        public ClipboardManager getCopy() {
-            ClipboardManager clip = (ClipboardManager) mActivity.getSystemService(Context.CLIPBOARD_SERVICE);
-            clip.setText(no);
-            showToast("复制成功！");
-            return clip;
+        public void getCopy() {
+
         }
 
 

module_home/src/main/res/drawable/shape_rv_bg_write_semicircle.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners
+        android:topRightRadius="@dimen/size_10"
+        android:topLeftRadius="@dimen/size_10"/>
+    <solid android:color="@color/colorWrite" />
+</shape>
\ No newline at end of file

module_home/src/main/res/layout/activity_member_order_details.xml

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <RelativeLayout
+        android:id="@+id/lay_title"
+        android:layout_width="match_parent"
+        android:background="@color/colorAuxiliaryYellow"
+        android:layout_height="@dimen/size_55">
+
+        <ImageView
+            android:id="@+id/iv_back"
+            android:layout_width="@dimen/size_32"
+            android:layout_height="@dimen/size_32"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="@dimen/size_5"
+            android:padding="@dimen/size_8"
+            android:src="@drawable/rv_common_icon_back_dark" />
+
+        <TextView
+            android:id="@+id/tv_center"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:ellipsize="end"
+            android:gravity="center"
+            android:maxLines="1"
+            android:maxWidth="320dp"
+            android:text="订单详情"
+            android:textColor="@color/textMain"
+            android:textSize="@dimen/text_18" />
+
+        <ImageView
+            android:id="@+id/iv_customer_service"
+            android:layout_width="@dimen/size_42"
+            android:layout_height="@dimen/size_32"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:src="@drawable/rv_rentingcar_icon_service_white"
+            android:layout_marginRight="@dimen/size_5"
+            android:padding="@dimen/size_8" />
+
+    </RelativeLayout>
+
+    <include layout="@layout/common_line"/>
+
+    <WebView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:id="@+id/webView" />
+
+    <include layout="@layout/common_line"/>
+
+    <LinearLayout
+        android:id="@+id/ll_item_bottom"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/size_70"
+        android:paddingLeft="@dimen/size_12"
+        android:paddingRight="@dimen/size_12"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/tv_cancel_order"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="@dimen/size_50"
+            android:textSize="@dimen/text_14"
+            android:gravity="center"
+            android:layout_marginRight="@dimen/size_5"
+            android:background="@drawable/shape_rv_border_gray"
+            android:textColor="@color/textGray"
+            android:text="@string/rv_cancel_order"
+            />
+
+        <TextView
+            android:id="@+id/tv_pay"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="@dimen/size_50"
+            android:textSize="@dimen/text_14"
+            android:gravity="center"
+            android:layout_marginLeft="@dimen/size_5"
+            android:background="@drawable/shape_rv_bg_yellow"
+            android:textColor="@color/colorWrite"
+            android:text="立即支付"
+            />
+    </LinearLayout>
+
+</LinearLayout>

module_home/src/main/res/layout/rv_item_rv_enthusiast.xml

@@ -9,7 +9,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/colorWrite"
+        android:background="@drawable/shape_rv_bg_write_semicircle"
         android:orientation="vertical">
 
 

module_mine/src/main/java/com/rv/rvmine/MineFragment.java

@@ -266,6 +266,8 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements  Simp
             tvLogin.setVisibility(View.VISIBLE);
             tvVerified.setVisibility(View.GONE);
             tvViewPrivileges.setText("会员中心");
+            tvMembershipLevel.setText("会员特权");
+            tvMemberHint.setText("免费用车7天");
         }
     }
 
@@ -380,6 +382,7 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements  Simp
 
                 if (0 == info.getIsMember()) {
                     tvMembershipLevel.setText("会员特权");
+                    tvMemberHint.setText("免费用车7天");
                     ivMember.setImageResource(R.drawable.mycenter_icon_type_general_user);
                 } else if (1 == info.getIsMember()) {
                     if (1 == info.getMemberLevel()) { //1 普通会员 2 黄金会员 3 钻石会员
@@ -392,6 +395,7 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements  Simp
                         tvMembershipLevel.setText("钻石会员特权");
                         ivMember.setImageResource(R.drawable.mycenter_icon_type_diamond_membership);
                     }
+                    tvMemberHint.setText("免费用车" +info.getRentFreeDays() +"天");
                 }
 
             }

module_tourism/src/main/java/com/rv/tourism/other/TravelerConfirmOrderActivity.java

@@ -286,7 +286,7 @@ public class TravelerConfirmOrderActivity extends BaseStatusActivity<TourismPres
         orderPriceDetailBean.setChildren(childrenBeanList);
     }
 
-    @OnClick({R2.id.ll_item_visitor_information, R2.id.tv_detail, R2.id.tv_confirm_order, R2.id.rl_item_notice})
+    @OnClick({R2.id.ll_item_visitor_information, R2.id.tv_detail, R2.id.tv_confirm_order, R2.id.rl_item_notice, R2.id.tv_contract})
     public void onViewClicked(View view) {
         int id = view.getId();
         if (id == R.id.ll_item_visitor_information) {
@@ -303,10 +303,17 @@ public class TravelerConfirmOrderActivity extends BaseStatusActivity<TourismPres
                     .withString("url",TourismApi.HTTP_URL_CAR_TYPE_NOTICE)
                     .withInt("type",14)
                     .navigation();
+        }else if (id == R.id.tv_contract){
+                  ARouter.getInstance().build(Constance.ACTIVITY_URL_WEBVIEW)
+                    .withString("title","合同协议")
+                    .withString("url",TourismApi.HTTP_URL_CAR_TYPE_NOTICE)
+                    .withInt("type",16)
+                    .navigation();
         }
     }
 
 
+
     /**
      * 订单支付
      */

module_tourism/src/main/res/layout/activity_confirm_order_travel.xml

@@ -482,6 +482,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:gravity="center"
+                android:drawableRight="@drawable/rv_common_icon_down_arrow"
+                android:drawablePadding="@dimen/size_3"
                 android:paddingLeft="@dimen/size_15"
                 android:paddingRight="@dimen/size_15"
                 android:text="明细"