bug修复

RvWrapper/src/main/java/com/ruiwenliu/wrapper/util/BaseGlideHolder.java

@@ -10,6 +10,7 @@ import com.bumptech.glide.request.RequestOptions;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.ruiwenliu.wrapper.R;
 import com.ruiwenliu.wrapper.util.glide.GlideApp;
+import com.ruiwenliu.wrapper.util.glide.GlideRoundTransform;
 
 /**
  * Created :Auser
@@ -69,7 +70,8 @@ public class BaseGlideHolder extends BaseViewHolder {
                 .load(url)
                 .placeholder(R.drawable.glide_icon_placeholder)
                 .error(R.drawable.glide_icon_error)
-                .apply(RequestOptions.bitmapTransform(new RoundedCorners(round)))
+//                .apply(RequestOptions.bitmapTransform(new RoundedCorners(round)))
+                .apply(RequestOptions.bitmapTransform(new GlideRoundTransform(context,round)))
                 .into(image);
     }
 

RvWrapper/src/main/java/com/ruiwenliu/wrapper/util/ScaleUtils.java

+package com.ruiwenliu.wrapper.util;
+
+import android.content.Context;
+import android.util.TypedValue;
+
+public class ScaleUtils {
+    //dp转px
+    public static int dip2px(Context context, int dpValue) {
+        final float scale = context.getResources().getDisplayMetrics().density;
+        return (int) (dpValue * scale + 0.5f);
+    }
+
+    //px转dp
+    public static int px2dip(Context context, int pxValue) {
+        return ((int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, pxValue, context.getResources().getDisplayMetrics()));
+    }
+}

RvWrapper/src/main/java/com/ruiwenliu/wrapper/util/glide/GlideManager.java

@@ -13,12 +13,14 @@ import com.bumptech.glide.gifdecoder.GifDecoder;
 import com.bumptech.glide.load.DataSource;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.load.engine.GlideException;
+import com.bumptech.glide.load.resource.bitmap.CenterCrop;
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 import com.bumptech.glide.load.resource.gif.GifDrawable;
 import com.bumptech.glide.request.RequestListener;
 import com.bumptech.glide.request.RequestOptions;
 import com.bumptech.glide.request.target.Target;
 import com.ruiwenliu.wrapper.R;
+import com.ruiwenliu.wrapper.util.ScaleUtils;
 
 import java.lang.reflect.Field;
 
@@ -105,7 +107,8 @@ public class GlideManager {
     public void loadRoundImage(String url, ImageView image, int round) {
         GlideApp.with(mContext)
                 .load(url)
-                .apply(RequestOptions.bitmapTransform(new RoundedCorners(round)))
+//                .apply(RequestOptions.bitmapTransform(new CenterCrop(),new RoundedCorners(round)))
+                .apply(RequestOptions.bitmapTransform(new GlideRoundTransform(mContext,round)))
                 .into(image);
     }
 

RvWrapper/src/main/java/com/ruiwenliu/wrapper/util/glide/GlideRoundTransform.java

+package com.ruiwenliu.wrapper.util.glide;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapShader;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.RectF;
+
+import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
+import com.bumptech.glide.load.resource.bitmap.CenterCrop;
+import com.ruiwenliu.wrapper.util.ScaleUtils;
+
+import java.security.MessageDigest;
+
+public class GlideRoundTransform extends CenterCrop {
+    private static float radius = 10f;
+    public GlideRoundTransform(Context context) {
+        this(context,10);
+    }
+    public GlideRoundTransform(Context context, int dp) {
+        super();
+        this.radius = ScaleUtils.dip2px(context,dp);
+    }
+
+    @Override
+    protected Bitmap transform(BitmapPool pool, Bitmap toTransform, int outWidth, int outHeight) {
+        //glide4.0+
+        Bitmap transform = super.transform(pool, toTransform, outWidth, outHeight);
+        return roundCrop(pool, transform);
+        //glide3.0
+        //return roundCrop(pool, toTransform);
+    }
+
+    private static Bitmap roundCrop(BitmapPool pool, Bitmap source) {
+        if (source == null) return null;
+
+        Bitmap result = pool.get(source.getWidth(), source.getHeight(), Bitmap.Config.ARGB_8888);
+        if (result == null) {
+            result = Bitmap.createBitmap(source.getWidth(), source.getHeight(), Bitmap.Config.ARGB_8888);
+        }
+
+        Canvas canvas = new Canvas(result);
+        Paint paint = new Paint();
+        paint.setShader(new BitmapShader(source, BitmapShader.TileMode.CLAMP, BitmapShader.TileMode.CLAMP));
+        paint.setAntiAlias(true);
+        RectF rectF = new RectF(0f, 0f, source.getWidth(), source.getHeight());
+        canvas.drawRoundRect(rectF, radius, radius, paint);
+        return result;
+    }
+
+    public String getId() {
+        return getClass().getName() + Math.round(radius);
+    }
+
+    @Override
+    public void updateDiskCacheKey(MessageDigest messageDigest) {
+
+    }
+
+}
\ No newline at end of file

component_resource/src/main/res/drawable/shape_rv_bg_circle_transparent.xml

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

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

@@ -22,6 +22,7 @@ import com.rv.camp.camp.CampDetailActivity;
 import com.rv.camp.presenter.CampPresenter;
 
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 
 import butterknife.BindView;
@@ -30,7 +31,7 @@ import butterknife.OnClick;
 /**
  * 营地
  */
-public class CampFragment extends BaseFragment<CampPresenter> implements BaseQuickAdapter.RequestLoadMoreListener{
+public class CampFragment extends BaseFragment<CampPresenter> implements BaseQuickAdapter.RequestLoadMoreListener {
 
     @BindView(R2.id.rv_content)
     RecyclerView rvContent;
@@ -44,7 +45,7 @@ public class CampFragment extends BaseFragment<CampPresenter> implements BaseQui
     private CampTypeListAdapter campTypeListAdapter;
     private int mPage;
     private int countPage;
-    private String type =null;
+    private String type = null;
 
 
     public static CampFragment getInstance(int type) {
@@ -92,9 +93,9 @@ public class CampFragment extends BaseFragment<CampPresenter> implements BaseQui
                 CampListBean.DataBeanX.DataBean data = (CampListBean.DataBeanX.DataBean) adapter.getItem(position);
                 ARouter.getInstance()
                         .build(Constance.ACTIVITY_URL_CAMPDETAIL)
-                        .withString("id",data.getId())
-                        .withString("longitude",data.getLongitude())
-                        .withString("latitude",data.getLatitude())
+                        .withString("id", data.getId())
+                        .withString("longitude", data.getLongitude())
+                        .withString("latitude", data.getLatitude())
                         .navigation();
             }
         });
@@ -118,22 +119,22 @@ public class CampFragment extends BaseFragment<CampPresenter> implements BaseQui
         }
     }
 
-    @OnClick({R2.id.tv_camp_type, R2.id.iv_camp_map,R2.id.v_shadow})
+    @OnClick({R2.id.tv_camp_type, R2.id.iv_camp_map, R2.id.v_shadow})
     public void onViewClicked(View view) {
         int id = view.getId();
         if (id == R.id.tv_camp_type) {
             //类型
-           if (isOpen){
-               rvType.setVisibility(View.VISIBLE);
-               vShadow.setVisibility(View.VISIBLE);
-           }else {
-               rvType.setVisibility(View.GONE);
-               vShadow.setVisibility(View.GONE);
-           }
+            if (isOpen) {
+                rvType.setVisibility(View.VISIBLE);
+                vShadow.setVisibility(View.VISIBLE);
+            } else {
+                rvType.setVisibility(View.GONE);
+                vShadow.setVisibility(View.GONE);
+            }
             isOpen = !isOpen;
         } else if (id == R.id.iv_camp_map) {
-           //地图
-        }else if (id == R.id.v_shadow){
+            //地图
+        } else if (id == R.id.v_shadow) {
             rvType.setVisibility(View.GONE);
             vShadow.setVisibility(View.GONE);
             isOpen = true;
@@ -157,22 +158,27 @@ public class CampFragment extends BaseFragment<CampPresenter> implements BaseQui
     private void getCampList(int page) {
         Map<String, Object> map = new LinkedHashMap<>();
         map.put("page", page);
-        if (type !=null) {
+        if (type != null) {
             map.put("type", type);
         }
         mPresenter.getData(RvFrameConfig.VEHICLE_CAMPLIST, 0, CampApi.TRAVEL_CAMPSITESHOP, CampListBean.class, map, page == 1 ? true : false);
     }
 
-    private void getCampTypeList(){
-        mPresenter.getData(RvFrameConfig.VEHICLE_CAMPLIST,1,CampApi.TRAVEL_CAMPSITETAG, CampTypeBean.class,false);
+    private void getCampTypeList() {
+        mPresenter.getData(RvFrameConfig.VEHICLE_CAMPLIST, 1, CampApi.TRAVEL_CAMPSITETAG, CampTypeBean.class, false);
     }
 
     private void processTypeData(CampTypeBean bean) {
-        campTypeListAdapter.setNewData(bean.getData());
+        List<CampTypeBean.DataBean> data = bean.getData();
+        if (data != null && data.size() > 0) {
+            CampTypeBean.DataBean dataBean = new CampTypeBean.DataBean();
+            dataBean.setName("全部");
+            data.add(0, dataBean);
+        }
+        campTypeListAdapter.setNewData(data);
     }
 
 
-
     /**
      * 刷新数据
      */
@@ -191,12 +197,12 @@ public class CampFragment extends BaseFragment<CampPresenter> implements BaseQui
             }
 
             countPage = bean.getData().getTotalPage();
-            if (bean.getData().getData() !=null) {
+            if (bean.getData().getData() != null) {
                 campAdapter.setNewData(bean.getData().getData());
             }
             campAdapter.loadMoreComplete();
         } else {
-            if (bean.getData().getData() !=null) {
+            if (bean.getData().getData() != null) {
                 campAdapter.addData(bean.getData().getData());
             }
             campAdapter.loadMoreComplete();

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

@@ -191,8 +191,8 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
         switch (requestType) {
             case 0:
                 priceBean = (OrderPriceBean) result;
-                tvPayMoney.setText(String.format("￥%1$s", priceBean.getData().getOrderAmount()));
-                tvDeposit.setText(String.format("￥%1$s%2$s", priceBean.getData().getDeposit(), mActivity.getString(R.string.rv_rb)));
+                tvPayMoney.setText(String.format("¥%1$s", priceBean.getData().getOrderAmount()));
+                tvDeposit.setText(String.format("¥%1$s%2$s", priceBean.getData().getDeposit(), mActivity.getString(R.string.rv_rb)));
                 orderPriceDetailBean = new Gson().fromJson(priceBean.getData().getCostDetail(), OrderPriceDetailBean.class);
                 break;
             case 1:
@@ -312,7 +312,7 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
             @Override
             public void helper(final ViewHolder helper) {
                 super.helper(helper);
-                helper.setText(R.id.tv_amount, String.format("￥%1$s", priceBean.getData().getOrderAmount()));
+                helper.setText(R.id.tv_amount, String.format("¥%1$s", priceBean.getData().getOrderAmount()));
                 helper.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {

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

@@ -233,7 +233,6 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
         tvItemRvTour.setSelected(true);
         tvHotRvtour.setTextColor(getResources().getColor(R.color.text_Main));
         tvHotRvtour.getPaint().setFakeBoldText(true);
-        scrollview.scrollTo(0,0);
 
         ViewTreeObserver observer = rlItemLayout.getViewTreeObserver();
         observer.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
@@ -763,12 +762,14 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
         if (bean.getData().getTotalCount() > 0) {
             if (headTvGetShop != null && TextUtils.isEmpty(headTvGetShop.getText().toString().trim())) {
                 headTvGetShop.setText(bean.getData().getData().get(0).getName());
+                headTvGetShop.setTextColor(_mActivity.getResources().getColor(R.color.colorMain));
                 latLatitude = bean.getData().getData().get(0).getLatitude();
                 lonLongitude = bean.getData().getData().get(0).getLongitude();
             }
 
             if (headTvOutShop != null && TextUtils.isEmpty(headTvOutShop.getText().toString().trim())) {
                 headTvOutShop.setText(bean.getData().getData().get(0).getName());
+                headTvOutShop.setTextColor(_mActivity.getResources().getColor(R.color.colorMain));
                 outLatitude = bean.getData().getData().get(0).getLatitude();
                 outLongitude = bean.getData().getData().get(0).getLongitude();
             }

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

@@ -29,7 +29,7 @@ public class CarRentalListAdapter extends BaseQuickAdapter<CarTypeListBean.DataB
             helper.setText(R.id.tv_point,String.valueOf(item.getVehicleModel().getPoint()));
             helper.loadImage(mContext,item.getVehicleModel().getPicture(), (ImageView) helper.getView(R.id.iv_goods));
 //        helper.setText(R.id.tv_name,item);
-            helper.setText(R.id.tv_price,String.format("￥%1$s%2$s",item.getVehicleModel().getPrice(),mContext.getString(R.string.rv_day)));
+            helper.setText(R.id.tv_price,String.format("¥%1$s%2$s",item.getVehicleModel().getPrice(),mContext.getString(R.string.rv_day)));
         }
 
         helper.setText(R.id.tv_address,item.getCompany().getName());

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

@@ -22,7 +22,7 @@ public class HotCarTypeAdapter extends BaseQuickAdapter<HomeHotGoodListBean.Data
 
     @Override
     protected void convert(BaseGlideHolder helper, HomeHotGoodListBean.DataBean bean) {
-        helper.loadRoundImage(mContext,bean.getImgUrl(), (ImageView) helper.getView(R.id.iv_goods),20);
+        helper.loadRoundImage(mContext,bean.getImgUrl(), (ImageView) helper.getView(R.id.iv_goods),10);
         helper.setText(R.id.tv_name,bean.getName());
         helper.setText(R.id.tv_content,bean.getName1());
         if (!TextUtil.isEmpty(bean.getPrice())) {

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

@@ -51,7 +51,7 @@ public class CompletedAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
                     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_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;
@@ -70,7 +70,7 @@ public class CompletedAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
                 helper.setText(R.id.tv_car_type, dataBean2.getName());
                 helper.setText(R.id.tv_out_time, mContext.getString(R.string.rv_to_time) +TimeManager.stampToDate2(String.valueOf( 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", "3200000"));
+                helper.setText(R.id.tv_price, String.format("¥%1$s", "3200000"));
                 helper.setText(R.id.tv_camp_process, mContext.getString(R.string.rv_to_evaluation));
                 helper.addOnClickListener(R.id.tv_camp_process);
                 break;

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

@@ -48,7 +48,7 @@ public class ForPaymentAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity
                     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_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);
@@ -68,7 +68,7 @@ public class ForPaymentAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity
                 helper.setText(R.id.tv_car_type, dataBean2.getName());
                 helper.setText(R.id.tv_out_time, mContext.getString(R.string.rv_to_time) +TimeManager.stampToDate2(String.valueOf( 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.getOrderAmount()));
+                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);
                 break;

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

@@ -51,7 +51,7 @@ public class HaveToTravelAdapter extends BaseMultiItemQuickAdapter<MultiItemEnti
                     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_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;
@@ -70,7 +70,7 @@ public class HaveToTravelAdapter extends BaseMultiItemQuickAdapter<MultiItemEnti
                 helper.setText(R.id.tv_car_type,dataBean2.getName());
                 helper.setText(R.id.tv_out_time, mContext.getString(R.string.rv_to_time) +TimeManager.stampToDate2(String.valueOf( 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.getOrderAmount()));
+                helper.setText(R.id.tv_price, String.format("¥%1$s", dataBean2.getOrderAmount()));
                 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);

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

@@ -51,7 +51,7 @@ public class OrderListAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
                     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_price, String.format("¥%1$s", dataBean.getOrderAmount()));
 
                 /**
                  *
@@ -115,7 +115,7 @@ public class OrderListAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
                 helper.setText(R.id.tv_car_type, dataBean2.getName());
                 helper.setText(R.id.tv_out_time, mContext.getString(R.string.rv_to_time) + TimeManager.stampToDate2(String.valueOf(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", "3200000"));
+                helper.setText(R.id.tv_price, String.format("¥%1$s", "3200000"));
 
                 /**
                  *

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

@@ -51,7 +51,7 @@ public class ToTravelAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
                     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_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;
@@ -70,7 +70,7 @@ public class ToTravelAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
                 helper.setText(R.id.tv_car_type, dataBean2.getName());
                 helper.setText(R.id.tv_out_time, mContext.getString(R.string.rv_to_time) +TimeManager.stampToDate2(String.valueOf( 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", "3200000"));
+                helper.setText(R.id.tv_price, String.format("¥%1$s", "3200000"));
                 helper.setText(R.id.tv_camp_process, mContext.getString(R.string.tv_boarding));
                 helper.addOnClickListener(R.id.tv_camp_process);
                 break;

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

@@ -8,6 +8,8 @@
 
     <com.rv.component.utils.ObservableScrollView
         android:id="@+id/scrollview"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 

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

@@ -8,7 +8,7 @@
         android:layout_marginLeft="@dimen/size_5"
         android:layout_width="wrap_content"
         android:id="@+id/tv_type_name"
-        android:textSize="@dimen/text_16"
+        android:textSize="@dimen/text_14"
         android:textColor="@color/textMain"
         android:textStyle="bold"
         android:layout_height="wrap_content" />

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

@@ -12,8 +12,8 @@
         android:layout_marginRight="@dimen/size_5"
         android:paddingTop="@dimen/size_10"
         android:paddingBottom="@dimen/size_10"
-        android:paddingLeft="@dimen/size_5"
         android:layout_gravity="center"
+        android:gravity="center_horizontal"
         android:background="@drawable/shape_rv_line_bg"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
@@ -22,6 +22,7 @@
               android:text=""
               android:id="@+id/tv_attr_name"
               android:paddingRight="@dimen/size_5"
+              android:paddingLeft="@dimen/size_5"
                android:layout_centerInParent="true"
               android:textColor="@color/textMain"
               android:layout_height="wrap_content"

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

@@ -8,6 +8,7 @@
     <ImageView
         android:id="@+id/iv_activity"
         android:layout_width="@dimen/size_240"
-        android:layout_height="@dimen/size_150"/>
+        android:layout_height="@dimen/size_150"
+        android:scaleType="centerCrop"/>
 
 </LinearLayout>
\ No newline at end of file

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

@@ -77,7 +77,7 @@
     <string name="rv_cancel">取消</string>
     <string name="rv_shop_map">门店地图</string>
     <string name="rv_select_car_num_hint">选择车辆数量</string>
-    <string name="rv_select_driving_num_hint">欣新专职司机（人）</string>
+    <string name="rv_select_driving_num_hint">欣新专职司机（￥600/天）</string>
     <string name="rv_user_driving">自驾</string>
     <string name="rv_user_driving_hint">(需提供驾驶人信息)</string>
     <string name="rv_driving_set">驾驶人设置</string>

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

@@ -95,7 +95,7 @@ public class MineFragment extends BaseFragment<CommonPresenter> {
     @BindView(R2.id.mine_banner)
     Banner mineBanner;
 
-    private  UserInfoBean.UserInfo info;
+    private UserInfoBean.UserInfo info;
 
     public static MineFragment getInstance(int type) {
         Bundle bundl = new Bundle();
@@ -120,11 +120,13 @@ public class MineFragment extends BaseFragment<CommonPresenter> {
             ivMember.setVisibility(View.GONE);
             tvLogin.setVisibility(View.VISIBLE);
             tvVerified.setVisibility(View.GONE);
+            tvViewPrivileges.setText("会员中心");
         } else {
             tvNickname.setVisibility(View.VISIBLE);
             ivMember.setVisibility(View.VISIBLE);
             tvLogin.setVisibility(View.GONE);
             tvVerified.setVisibility(View.VISIBLE);
+            tvViewPrivileges.setText("查看会员特权");
         }
     }
 
@@ -134,7 +136,6 @@ public class MineFragment extends BaseFragment<CommonPresenter> {
     }
 
 
-
     @SuppressLint("CheckResult")
     private void initRxBus() {
         RxBus.tObservable(UserInfoEvent.class)
@@ -160,7 +161,7 @@ public class MineFragment extends BaseFragment<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_setting,R2.id.rl_item_driver,R2.id.rl_item_traveler})
+            R2.id.rl_item_setting, R2.id.rl_item_driver, R2.id.rl_item_traveler})
     public void onViewClicked(View view) {
         int id = view.getId();
         if (id == R.id.iv_avatar) {
@@ -201,7 +202,7 @@ public class MineFragment extends BaseFragment<CommonPresenter> {
             if (isLogin()) return;
             startActivity(OrderListActivity.getIntent(_mActivity, 4));
 
-        }else if (id ==R.id.rl_item_my_release){
+        } else if (id == R.id.rl_item_my_release) {
             //我的发布
             if (isLogin()) return;
 
@@ -213,18 +214,18 @@ public class MineFragment extends BaseFragment<CommonPresenter> {
         } else if (id == R.id.rl_item_personal_information) {
             //个人资料
             if (isLogin()) return;
-            startActivity(PersonalInformationActivity.getIntent(_mActivity,info));
+            startActivity(PersonalInformationActivity.getIntent(_mActivity, info));
 
         } else if (id == R.id.rl_item_setting) {
             //设置
             if (isLogin()) return;
             startActivityForResult(SettingActivity.getIntent(_mActivity), 101);
 
-        }else if (id == R.id.rl_item_driver){
+        } else if (id == R.id.rl_item_driver) {
             //驾驶人
             if (isLogin()) return;
-             startActivity(DrivingListActivity.getIntent(_mActivity,null));
-        }else if (id == R.id.rl_item_traveler){
+            startActivity(DrivingListActivity.getIntent(_mActivity, null));
+        } else if (id == R.id.rl_item_traveler) {
             //出游人
             if (isLogin()) return;
             startActivity(ChooseAVisitorActivity.getIntent(_mActivity));
@@ -232,7 +233,7 @@ public class MineFragment extends BaseFragment<CommonPresenter> {
     }
 
     @Override
-     public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+    public 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);
@@ -240,6 +241,7 @@ public class MineFragment extends BaseFragment<CommonPresenter> {
             ivMember.setVisibility(View.GONE);
             tvLogin.setVisibility(View.VISIBLE);
             tvVerified.setVisibility(View.GONE);
+            tvViewPrivileges.setText("会员中心");
         }
     }
 
@@ -321,18 +323,35 @@ public class MineFragment extends BaseFragment<CommonPresenter> {
     private void userInfoData(UserInfoBean infoBean) {
         if (infoBean != null) {
             info = infoBean.getData();
-            if (info !=null) {
+            if (info != null) {
                 GlideManager.getInstance(_mActivity).loadImage(info.getHeadimgurl(), ivAvatar);
                 tvNickname.setText(info.getUsername());
                 //更新实名信息
                 UtilsManager.getInstance(_mActivity).setSharePreferencesSave(SPConstance.USER_JSON).putString(SPConstance.USER_JSON_ISCERTIFICATIONSTATUS, String.valueOf(info.getCertificationStatus())).commit();
-            if (info.getCertificationStatus() == 0) { //实名认证状态:0-未认证，1-已认证
-                tvVerified.setText("未实名认证");
-                tvVerified.setEnabled(true);
-            } else if (info.getCertificationStatus() == 1) {
-                tvVerified.setText("已实名认证");
-                tvVerified.setEnabled(false);
-            }
+                if (info.getCertificationStatus() == 0) { //实名认证状态:0-未认证，1-已认证
+                    tvVerified.setText("未实名认证");
+                    tvVerified.setEnabled(true);
+                } else if (info.getCertificationStatus() == 1) {
+                    tvVerified.setText("已实名认证");
+                    tvVerified.setEnabled(false);
+                }
+
+                if ("0".equals(info.getIsMember())) {
+                    tvMembershipLevel.setText("会员特权");
+                    ivMember.setImageResource(R.drawable.mycenter_icon_type_general_user);
+                } else if ("1".equals(info.getIsMember())) {
+                    if ("1".equals(info.getMemberLevel())) { //1 普通会员 2 黄金会员 3 钻石会员
+                        tvMembershipLevel.setText(" 普通会员特权");
+                        ivMember.setImageResource(R.drawable.mycenter_icon_type_ordinary_member);
+                    } else if ("2".equals(info.getMemberLevel())) {
+                        tvMembershipLevel.setText("黄金会员特权");
+                        ivMember.setImageResource(R.drawable.mycenter_icon_type_gold_member);
+                    } else if ("3".equals(info.getMemberLevel())) {
+                        tvMembershipLevel.setText("钻石会员特权");
+                        ivMember.setImageResource(R.drawable.mycenter_icon_type_diamond_membership);
+                    }
+                }
+
             }
 
             if (TextUtils.isEmpty(OkGoUtil.getToken())) {
@@ -340,11 +359,13 @@ public class MineFragment extends BaseFragment<CommonPresenter> {
                 ivMember.setVisibility(View.GONE);
                 tvLogin.setVisibility(View.VISIBLE);
                 tvVerified.setVisibility(View.GONE);
+                tvViewPrivileges.setText("会员中心");
             } else {
                 tvNickname.setVisibility(View.VISIBLE);
                 ivMember.setVisibility(View.VISIBLE);
                 tvLogin.setVisibility(View.GONE);
                 tvVerified.setVisibility(View.VISIBLE);
+                tvViewPrivileges.setText("查看会员特权");
             }
         }
     }

module_mine/src/main/java/com/rv/rvmine/bean/UserInfoBean.java

@@ -50,7 +50,7 @@ public class UserInfoBean extends BaseBean {
         //实名认证状态:0-未认证，1-已认证
         private Integer certificationStatus;
         //会员
-        private Integer isMember;
+        private Integer isMember;  // 是否为会员 0-普通用户  1-会员
         //昵称
         private String nickname;
         //真实姓名
@@ -68,6 +68,10 @@ public class UserInfoBean extends BaseBean {
         //备注
         private String remark;
 
+        private String memberLevel;//  会员等级
+
+        private String rentFreeDays;// 剩余天数
+
         public Integer getId() {
             return id;
         }
@@ -219,5 +223,21 @@ public class UserInfoBean extends BaseBean {
         public void setRemark(String remark) {
             this.remark = remark;
         }
+
+        public String getMemberLevel() {
+            return memberLevel;
+        }
+
+        public void setMemberLevel(String memberLevel) {
+            this.memberLevel = memberLevel;
+        }
+
+        public String getRentFreeDays() {
+            return rentFreeDays;
+        }
+
+        public void setRentFreeDays(String rentFreeDays) {
+            this.rentFreeDays = rentFreeDays;
+        }
     }
 }

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

@@ -59,7 +59,7 @@
                             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_type_general_user"
                             android:visibility="gone" />
 
 
@@ -73,7 +73,6 @@
                             android:text="@string/tv_login"
                             android:textColor="@color/colorYellow"
                             android:textSize="@dimen/text_14" />
-
                     </LinearLayout>
 
                     <TextView
@@ -126,7 +125,7 @@
                         android:id="@+id/tv_membership_level"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="黄金会员特权"
+                        android:text="会员特权"
                         android:textColor="@color/colorMain"
                         android:textSize="@dimen/text_14" />
 
@@ -143,11 +142,12 @@
                 <TextView
                     android:id="@+id/tv_view_privileges"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
                     android:layout_marginRight="@dimen/size_15"
                     android:drawableRight="@drawable/common_icon_rig_black"
                     android:drawablePadding="@dimen/size_8"
-                    android:text="@string/tv_view_privileges"
+                    android:gravity="center_vertical"
+                    android:text="会员中心"
                     android:textColor="@color/colorMain"
                     android:textSize="@dimen/text_12" />
 
@@ -436,10 +436,10 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingTop="@dimen/size_3"
-            android:paddingBottom="@dimen/size_15"
             android:background="@color/colorWrite"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            android:paddingTop="@dimen/size_3"
+            android:paddingBottom="@dimen/size_15">
 
             <RelativeLayout
                 android:id="@+id/rl_item_traveler"
@@ -478,29 +478,27 @@
                 android:layout_width="0dp"
                 android:layout_height="@dimen/size_60"
                 android:layout_weight="1"
-                android:orientation="vertical">
-            </RelativeLayout>
+                android:orientation="vertical"></RelativeLayout>
 
             <RelativeLayout
                 android:layout_width="0dp"
                 android:layout_height="@dimen/size_60"
                 android:layout_weight="1"
-                android:orientation="vertical">
-            </RelativeLayout>
+                android:orientation="vertical"></RelativeLayout>
+
             <RelativeLayout
                 android:layout_width="0dp"
                 android:layout_height="@dimen/size_60"
                 android:layout_weight="1"
-                android:orientation="vertical">
-            </RelativeLayout>
+                android:orientation="vertical"></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" />
+            android:layout_height="@dimen/size_100"
+            android:layout_marginTop="@dimen/size_15" />
 
 
     </LinearLayout>

module_tourism/src/main/java/com/rv/tourism/adapter/TourAroundAdapter.java

@@ -22,7 +22,7 @@ public class TourAroundAdapter extends BaseQuickAdapter<BeanTourAround.DataBeanX
          helper.setText(R.id.tv_title,item.getName());
 //         helper.setText(R.id.tv_city,item.get)
         helper.setText(R.id.tv_people,item.getStock());
-        helper.setText(R.id.tv_price,String.format("￥%1$s%2$s",item.getPrice(),item.getUnit()));
+        helper.setText(R.id.tv_price,String.format("¥%1$s%2$s",item.getPrice(),item.getUnit()));
     }
 
     public void addNewData(BeanTourAround bean) {

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

@@ -68,6 +68,8 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
     ImageView ivShare;
     @BindView(R2.id.ll_item_bottom)
     LinearLayout llItemBottom;
+    @BindView(R2.id.tv_appointment)
+    TextView TvAppointment;
 
     private ShareManager shareManager;
     private String webUrl;
@@ -104,6 +106,7 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
         webUrl = "https://xxtest.upyuns.com/h5/appHtml/view/travelDetails.html?id=" + id;
         initWeb();
         initShare(webUrl, name, content, url);
+        mWebView.loadUrl("JavaScript:getTourStock()"); // Android调用h5
     }
 
     @OnClick({R2.id.iv_back, R2.id.tv_appointment, R2.id.iv_collect, R2.id.iv_share, R2.id.tv_customer_service})
@@ -135,9 +138,8 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
 //                startActivity(LoginRvActivity.getIntent(mActivity));
                 return;
             }
-//            mWebView.loadUrl("JavaScript:getTourStock()"); // Android调用h5
-            mWebView.loadUrl("JavaScript:openModal()"); // Android调用h5
-            llItemBottom.setVisibility(View.GONE);
+            mWebView.loadUrl("JavaScript:getTourStock()"); // Android调用h5
+//            mWebView.loadUrl("JavaScript:openModal()"); // Android调用h5
         }
     }
 
@@ -251,6 +253,7 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
         webSettings.setAllowUniversalAccessFromFileURLs(true);
         mWebView.addJavascriptInterface(new AndroidJs(), "AndroidJs");
         mWebView.loadUrl(webUrl);
+
         mWebView.setWebChromeClient(new WebChromeClient() {
             @Override
             public void onProgressChanged(WebView view, int newProgress) {
@@ -327,17 +330,36 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
 
         @JavascriptInterface
         public void showButton() {
-            showToast("333");
-            llItemBottom.setVisibility(View.VISIBLE);
+            mWebView.post(new Runnable() {
+                @Override
+                public void run() {
+                    llItemBottom.setVisibility(View.VISIBLE);
+                }
+            });
+
         }
 
         @JavascriptInterface
         public void tourStock(int num) {
+            showToast("22222");
             if (num > 0) {
-                showToast("44444444");
-//                mWebView.loadUrl("JavaScript:openModal()"); // Android调用h5
+                mWebView.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        mWebView.loadUrl("JavaScript:openModal()"); // Android调用h5
+                        llItemBottom.setVisibility(View.GONE);
+                    }
+                });
             } else {
-                showToast("库存不足！");
+                mWebView.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        showToast("库存不足");
+                        TvAppointment.setText("库存不足");
+                        TvAppointment.setBackground(mActivity.getResources().getDrawable(R.color.gray_707070));
+                    }
+                });
+
             }
         }
 

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

@@ -129,7 +129,7 @@ public class TravelerConfirmOrderActivity extends BaseStatusActivity<TourismPres
             int childPrice = Integer.valueOf(dataBean.getChildPrice());
             int adultPrice = Integer.valueOf(dataBean.getPrice());
             price = (childNum * childPrice) + (adultNum * adultPrice);
-            tvPaymentAmount.setText(String.format("￥%1$s", price));
+            tvPaymentAmount.setText(String.format("¥%1$s", price));
 
             for (int i = 0; i < Integer.valueOf(dataBean.getAdultNum()); i++) {
                 BeanVisitorInformation travelMember = new BeanVisitorInformation();