首页改版的2020-2-20提交代码

RvClient/src/main/res/layout/activity_main.xml

@@ -28,8 +28,8 @@
 
             <ImageView
                 android:id="@+id/iv_home"
-                android:layout_width="@dimen/size_19"
-                android:layout_height="@dimen/size_19"
+                android:layout_width="17dp"
+                android:layout_height="17dp"
                 android:layout_centerHorizontal="true"
                 android:src="@drawable/selector_rv_home" />
 
@@ -53,8 +53,8 @@
 
             <ImageView
                 android:id="@+id/iv_travel"
-                android:layout_width="@dimen/size_19"
-                android:layout_height="@dimen/size_19"
+                android:layout_width="17dp"
+                android:layout_height="17dp"
                 android:layout_centerHorizontal="true"
                 android:src="@drawable/selector_rv_travel" />
 
@@ -78,8 +78,8 @@
 
             <ImageView
                 android:id="@+id/iv_camp"
-                android:layout_width="@dimen/size_19"
-                android:layout_height="@dimen/size_19"
+                android:layout_width="17dp"
+                android:layout_height="17dp"
                 android:layout_centerHorizontal="true"
                 android:src="@drawable/selector_rv_camp" />
 
@@ -103,8 +103,8 @@
 
             <ImageView
                 android:id="@+id/iv_found"
-                android:layout_width="@dimen/size_19"
-                android:layout_height="@dimen/size_19"
+                android:layout_width="17dp"
+                android:layout_height="17dp"
                 android:layout_centerHorizontal="true"
                 android:src="@drawable/selector_rv_found" />
 
@@ -128,8 +128,8 @@
 
             <ImageView
                 android:id="@+id/iv_mine"
-                android:layout_width="@dimen/size_19"
-                android:layout_height="@dimen/size_19"
+                android:layout_width="17dp"
+                android:layout_height="17dp"
                 android:layout_centerHorizontal="true"
                 android:src="@drawable/selector_rv_mine" />
 

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

@@ -5,7 +5,6 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.LinearLayout;
@@ -72,12 +71,6 @@ public class CarRentActivity extends BaseStatusActivity<CarRentPresenter> implem
     private double latLatitude;  // 当前的经纬度
     private double lonLongitude; // 当前的经纬度
 
-//    private double getLatitude;  // 取车地点的经纬度
-//    private double getLongitude; // 取车地点的经纬度
-//
-//    private double outLatitude; // 还车公司经纬度
-//    private double outLongitude; // 还车公司经纬度
-
     private String begDate = "";  // 租车起始时间
     private String endDate = ""; // 还车时间
 
@@ -93,7 +86,6 @@ public class CarRentActivity extends BaseStatusActivity<CarRentPresenter> implem
     private long rentDay = 2;//租车天数
 
     public static Intent getIntent(Context context, String cityName) {
-        Log.e("xxxxxxxxxxxxxx",cityName) ;
         Intent intent = new Intent(context, CarRentActivity.class);
         intent.putExtra("cityName", cityName);
         return intent;
@@ -152,7 +144,6 @@ public class CarRentActivity extends BaseStatusActivity<CarRentPresenter> implem
                 }
             }
         }
-        Log.e("xxxxxxxx",String.valueOf(addrCity)) ;
         Map<String, Object> map = new LinkedHashMap<>();
         map.put("page", 1);
         map.put("limit", 1);
@@ -183,8 +174,7 @@ public class CarRentActivity extends BaseStatusActivity<CarRentPresenter> implem
                 tvHomeGetAddress.setText("");
             }
             tvHomeGetAddress.setTextColor(getResources().getColor(R.color.colorMain));
-//            getLatitude = bean.getData().getData().get(0).getLatitude();
-//            getLongitude = bean.getData().getData().get(0).getLongitude();
+
             getCompanyId = bean.getData().getData().get(0).getId();
 
             outCompanyName = bean.getData().getData().get(0).getName();
@@ -201,18 +191,12 @@ public class CarRentActivity extends BaseStatusActivity<CarRentPresenter> implem
                 tvHomeOutAddress.setText("");
             }
             tvHomeOutAddress.setTextColor(getResources().getColor(R.color.colorMain));
-//            outLatitude = bean.getData().getData().get(0).getLatitude();
-//            outLongitude = bean.getData().getData().get(0).getLongitude();
             outCompanyId = bean.getData().getData().get(0).getId();
         } else {
             getCompanyName = "";
             tvHomeGetAddress.setText(getCompanyName);
-//            getLatitude = 0;
-//            getLongitude = 0;
             outCompanyName = "";
             tvHomeOutAddress.setText(outCompanyName);
-//            outLatitude = 0;
-//            outLongitude = 0;
         }
     }
 
@@ -361,8 +345,6 @@ public class CarRentActivity extends BaseStatusActivity<CarRentPresenter> implem
                     } else {
                         tvHomeGetAddress.setText("");
                     }
-//                    getLatitude = data.getDoubleExtra("latitude", 0);
-//                    getLongitude = data.getDoubleExtra("longitude", 0);
                 } else if (type == 2) {
                     outCompanyName = data.getStringExtra("company");
                     outCompanyId = data.getIntExtra("company_id", 1);
@@ -380,8 +362,6 @@ public class CarRentActivity extends BaseStatusActivity<CarRentPresenter> implem
                     } else {
                         tvHomeOutAddress.setText("");
                     }
-//                    outLatitude = data.getDoubleExtra("latitude", 0);
-//                    outLongitude = data.getDoubleExtra("longitude", 0);
                 }
                 break;
             case 108:

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

@@ -19,6 +19,8 @@ import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.StaggeredGridLayoutManager;
 import android.text.TextUtils;
 import android.view.View;
+import android.widget.AdapterView;
+import android.widget.GridView;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -47,6 +49,7 @@ import com.rv.home.R;
 import com.rv.home.R2;
 import com.rv.home.rv.module.ApiConfig;
 import com.rv.home.rv.module.ui.main.home.adapter.HotCarTypeAdapter;
+import com.rv.home.rv.module.ui.main.home.adapter.HotCarTypeListAdapter;
 import com.rv.home.rv.module.ui.main.home.adapter.RVEnthusiastAdapter;
 import com.rv.home.rv.module.ui.main.home.adapter.RVTourListAdapter;
 import com.rv.home.rv.module.ui.main.home.adapter.RVTourListLabelAdapter;
@@ -81,7 +84,7 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
     @BindView(R2.id.home_banner)
     Banner mineBanner;
     @BindView(R2.id.ry_home_hot_travel)
-    RecyclerView ryHomeHotTravel;
+    RecyclerView ryHomeHotTravel ;
     @BindView(R2.id.ry_home_camp)
     RecyclerView ryHomeCamp ;
     @BindView(R2.id.recyclerView_home_activity)
@@ -169,22 +172,22 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
         drawable.setBounds(0, 0, DisplayUtil.dip2px(getContext(), 25), DisplayUtil.dip2px(getContext(), 5));
 
         mHotTravelAdapter = new HotCarTypeAdapter();
-        ryHomeHotTravel.setLayoutManager(new GridLayoutManager(getContext(), 2));
-        ryHomeHotTravel.addItemDecoration(new AbSpacesItemDecoration(10));// 分割线。
+
+        ryHomeHotTravel.setLayoutManager(new GridLayoutManager(getContext(),2));
+        ryHomeHotTravel.addItemDecoration(new AbSpacesItemDecoration(DisplayUtil.dip2px(_mActivity,5)));// 分割线。
         ryHomeHotTravel.setNestedScrollingEnabled(false);
         ryHomeHotTravel.setAdapter(mHotTravelAdapter);
 
-
         mCampAdapter = new HotCarTypeAdapter();
         ryHomeCamp.setLayoutManager(new GridLayoutManager(getContext(), 2));
-        ryHomeCamp.addItemDecoration(new AbSpacesItemDecoration(10));// 分割线。
+        ryHomeCamp.addItemDecoration(new AbSpacesItemDecoration(DisplayUtil.dip2px(_mActivity,5)));// 分割线。
         ryHomeCamp.setNestedScrollingEnabled(false);
         ryHomeCamp.setAdapter(mCampAdapter);
 
         //精选活动
         mActivityAdapter = new SelectedEventsAdapter();
         recyclerViewActivity.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.HORIZONTAL, false));
-        recyclerViewActivity.addItemDecoration(new AbSpacesItemDecoration(10));// 分割线。
+        recyclerViewActivity.addItemDecoration(new AbSpacesItemDecoration(DisplayUtil.dip2px(_mActivity,5)));// 分割线。
         recyclerViewActivity.setNestedScrollingEnabled(false);
         recyclerViewActivity.setAdapter(mActivityAdapter);
         mActivityAdapter.setOnItemClickListener((adapter, view, position) -> {
@@ -213,7 +216,7 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
         });
 
         recyclerViewRvEnthusiast.setLayoutManager(staggeredGridLayoutManager);
-        recyclerViewRvEnthusiast.addItemDecoration(new AbSpacesItemDecoration2(20, 10));// 分割线。
+        recyclerViewRvEnthusiast.addItemDecoration(new AbSpacesItemDecoration2(DisplayUtil.dip2px(_mActivity,5), DisplayUtil.dip2px(_mActivity,5)));// 分割线。
         recyclerViewRvEnthusiast.setNestedScrollingEnabled(false);
         recyclerViewRvEnthusiast.setAdapter(mRvEnthusiast);
 
@@ -238,19 +241,18 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
         //房车游榜单
         mRvTourAdapter = new RVTourListAdapter();
         recyclerViewRvtourlist.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.HORIZONTAL, false));
-        recyclerViewRvtourlist.addItemDecoration(new AbSpacesItemDecoration(10));
+        recyclerViewRvtourlist.addItemDecoration(new AbSpacesItemDecoration(DisplayUtil.dip2px(_mActivity,5)));
         recyclerViewRvtourlist.setNestedScrollingEnabled(false);
         recyclerViewRvtourlist.setAdapter(mRvTourAdapter);
 
         //  //房车游榜单 标注
         mRvTourLabelAdapter = new RVTourListLabelAdapter();
         recyclerViewRvtourlistTitle.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.HORIZONTAL, false));
-        recyclerViewRvtourlistTitle.addItemDecoration(new AbSpacesItemDecoration(20));
+        recyclerViewRvtourlistTitle.addItemDecoration(new AbSpacesItemDecoration(DisplayUtil.dip2px(_mActivity,5)));
         recyclerViewRvtourlistTitle.setNestedScrollingEnabled(false);
 
         height = _mActivity.getWindowManager().getDefaultDisplay().getHeight() ;
         scrollview.setScrollViewListener(HomeFragment.this);
-
         mHotTravelAdapter.setOnItemClickListener((adapter, view, position) -> {
             HomeHotGoodListBean.DataBean data = (HomeHotGoodListBean.DataBean) adapter.getItem(position);
 

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

@@ -9,12 +9,10 @@ import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 import com.bumptech.glide.request.RequestOptions;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.ruiwenliu.wrapper.util.BaseGlideHolder;
-import com.ruiwenliu.wrapper.util.TransformationUtil;
 import com.ruiwenliu.wrapper.util.TransformationUtil2;
 import com.ruiwenliu.wrapper.util.glide.GlideOptions;
 import com.rv.home.R;
 import com.rv.home.rv.module.ui.main.home.bean.HomeHotGoodListBean;
-import com.rv.home.rv.module.ui.main.home.bean.HomePopularBrigade;
 
 /**
  * Created :Auser
@@ -55,8 +53,13 @@ public class HotCarTypeAdapter extends BaseQuickAdapter<HomeHotGoodListBean.Data
 
         if ("2".equals(hotType) || "4".equals(hotType)) {
             helper.setGone(R.id.tv_content, false);
-        } else {
+            helper.setGone(R.id.tv_price, true);
+        } else if("3".equals(hotType)) {
+            helper.setGone(R.id.tv_content, false);
+            helper.setGone(R.id.tv_price, false);
+        } else{
             helper.setGone(R.id.tv_content, true);
+            helper.setGone(R.id.tv_price, false);
         }
     }
 

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

+package com.rv.home.rv.module.ui.main.home.adapter;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.base.utils.ui.datetime.selector.util.TextUtil;
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
+import com.bumptech.glide.request.RequestOptions;
+import com.ruiwenliu.wrapper.util.TransformationUtil2;
+import com.ruiwenliu.wrapper.util.glide.GlideOptions;
+import com.rv.home.R;
+import com.rv.home.rv.module.ui.main.home.bean.HomeHotGoodListBean;
+
+import java.util.List;
+
+/**
+ * Created :Auser
+ * Date: 2019/5/17.
+ * Desc:热门车型适配
+ */
+
+public class HotCarTypeListAdapter extends BaseAdapter {
+    private Context mContext ;
+    private List<HomeHotGoodListBean.DataBean> beans ;
+    private String hotType ;
+
+    public HotCarTypeListAdapter(Context context,String hotType, List<HomeHotGoodListBean.DataBean> beans){
+        this.mContext = context ;
+        this.beans = beans ;
+        this.hotType = hotType ;
+    }
+
+    @Override
+    public int getCount() {
+        return beans.size();
+    }
+
+    @Override
+    public Object getItem(int i) {
+        return beans.get(i);
+    }
+
+    @Override
+    public long getItemId(int i) {
+        return i;
+    }
+
+    @Override
+    public View getView(int i, View view, ViewGroup viewGroup) {
+        HomeHotGoodListBean.DataBean bean = beans.get(i);
+        ViewHolder holder;
+        if (view == null) {
+            view = LayoutInflater.from(mContext).inflate(R.layout.rv_item_hot_car_type, null);
+            holder = new ViewHolder();
+            holder.iv_goods = view.findViewById(R.id.iv_goods);
+            holder.tv_name = view.findViewById(R.id.tv_name);
+            holder.tv_content = view.findViewById(R.id.tv_content);
+            holder.tv_price = view.findViewById(R.id.tv_price);
+            view.setTag(holder);
+        } else {
+            holder = (ViewHolder) view.getTag();
+        }
+
+        GlideOptions options = GlideOptions.placeholderOf(com.ruiwenliu.wrapper.R.drawable.glide_icon_placeholder).
+                error(com.ruiwenliu.wrapper.R.drawable.glide_icon_error);
+        TransformationUtil2 utils = new TransformationUtil2(holder.iv_goods);
+        Glide.with(mContext)
+                .asBitmap()
+                .load(bean.getIcon())
+                .apply(options)
+                .apply(RequestOptions.bitmapTransform(new RoundedCorners(12)).override(holder.iv_goods.getWidth(), holder.iv_goods.getHeight()))
+                .into(utils);
+
+        holder.tv_name.setText(bean.getName());
+        holder.tv_content.setText( bean.getName1());
+
+        if (!TextUtil.isEmpty(bean.getPrice())) {
+            holder.tv_price.setText(String.format("¥%1$s%2$s", bean.getPrice(), getUnit()));
+        } else {
+            holder.tv_price.setText( "");
+        }
+
+        if ("2".equals(hotType) || "4".equals(hotType)) {
+            holder.tv_content.setVisibility(View.GONE) ;
+            holder.tv_price.setVisibility(View.VISIBLE);
+        } else if("3".equals(hotType)) {
+            holder.tv_content.setVisibility(View.GONE);
+            holder.tv_price.setVisibility(View.GONE);
+        } else{
+            holder.tv_content.setVisibility(View.VISIBLE);
+            holder.tv_price.setVisibility(View.GONE);
+        }
+        return null;
+    }
+
+    private String getUnit() {
+        if (!TextUtils.isEmpty(hotType)) {
+            switch (hotType) {
+                case "4":
+                    return mContext.getString(R.string.rv_one_car);
+                case "2":
+                    return mContext.getString(R.string.rv_one_person);
+                case "3":
+                    return mContext.getString(R.string.rv_day);
+                default:
+                    return mContext.getString(R.string.rv_one_car);
+            }
+        }
+        return mContext.getString(R.string.rv_one_car);
+    }
+
+    public void setData(List<HomeHotGoodListBean.DataBean> data) {
+        this.beans = data ;
+        notifyDataSetChanged();
+    }
+
+    private class ViewHolder {
+        ImageView iv_goods;
+        TextView tv_name;
+        TextView tv_content ;
+        TextView tv_price;
+    }
+}

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

@@ -19,6 +19,7 @@ public class RVTourListAdapter extends BaseQuickAdapter<HomePopularBrigade.DataB
     @Override
     protected void convert(BaseGlideHolder helper, HomePopularBrigade.DataBean bean) {
         helper.loadRoundImage(mContext,bean.getImg(), (ImageView) helper.getView(R.id.iv_rv_tour),6);
+        helper.setText(R.id.tv_lab,bean.getName()) ;
 //        GlideManager.getInstance(mContext).loadImage(bean.getImg(),  (ImageView)helper.getView(R.id.iv_rv_tour));
     }
 }

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

+package com.rv.home.rv.module.ui.main.home.adapter;
+
+import android.content.Context;
+import android.graphics.Rect;
+import android.support.v7.widget.GridLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.util.Log;
+import android.view.View;
+import android.view.ViewGroup;
+
+public class RvGridLayoutManager extends GridLayoutManager {
+
+    private int mChildPerLines;
+    private int[] mMeasuredDimension = new int[2];
+
+    public RvGridLayoutManager(Context context, int spanCount) {
+        super(context, spanCount);
+        this.mChildPerLines = spanCount;
+    }
+
+    @Override
+    public void onMeasure(RecyclerView.Recycler recycler, RecyclerView.State state, int widthSpec, int heightSpec) {
+
+        final int heightMode = View.MeasureSpec.getMode(heightSpec);
+        final int widthSize = View.MeasureSpec.getSize(widthSpec);
+        final int heightSize = View.MeasureSpec.getSize(heightSpec);
+        int height = 0;
+        for (int i = 0; i < getItemCount(); ) {
+            measureScrapChild(recycler, i,
+                    View.MeasureSpec.makeMeasureSpec(i, View.MeasureSpec.UNSPECIFIED),
+                    View.MeasureSpec.makeMeasureSpec(i, View.MeasureSpec.UNSPECIFIED),
+                    mMeasuredDimension);
+            height = height + mMeasuredDimension[1];
+            i = i + mChildPerLines;
+        }
+
+        // If child view is more than screen size, there is no need to make it wrap content. We can use original onMeasure() so we can scroll view.
+        if (height >heightSize) {
+            switch (heightMode) {
+                case View.MeasureSpec.EXACTLY:
+                    height = heightSize;
+                case View.MeasureSpec.AT_MOST:
+                case View.MeasureSpec.UNSPECIFIED:
+            }
+            setMeasuredDimension(widthSize, height);
+        } else {
+            super.onMeasure(recycler, state, widthSpec, heightSpec);
+        }
+    }
+
+    private void measureScrapChild(RecyclerView.Recycler recycler, int position, int widthSpec,
+                                   int heightSpec, int[] measuredDimension) {
+
+        View view = recycler.getViewForPosition(position);
+
+        // For adding Item Decor Insets to view
+        super.measureChildWithMargins(view, 0, 0);
+        if (view != null) {
+            RecyclerView.LayoutParams p = (RecyclerView.LayoutParams) view.getLayoutParams();
+            int childWidthSpec = ViewGroup.getChildMeasureSpec(widthSpec,
+                    getPaddingLeft() + getPaddingRight() + getDecoratedLeft(view) + getDecoratedRight(view), p.width);
+            int childHeightSpec = ViewGroup.getChildMeasureSpec(heightSpec,
+                    getPaddingTop() + getPaddingBottom() + getPaddingBottom() + getDecoratedBottom(view), p.height);
+            view.measure(childWidthSpec, childHeightSpec);
+
+            // Get decorated measurements
+            measuredDimension[0] = getDecoratedMeasuredWidth(view) + p.leftMargin + p.rightMargin;
+            measuredDimension[1] = getDecoratedMeasuredHeight(view) + p.bottomMargin + p.topMargin;
+            recycler.recycleView(view);
+        }
+    }
+}

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

 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -92,6 +91,7 @@
                     android:orientation="horizontal">
 
                     <TextView
+                        android:visibility="gone"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
@@ -118,14 +118,14 @@
                             android:gravity="center_vertical"
                             android:text=""
                             android:textColor="@color/colorMain"
-                            android:textSize="@dimen/text_12" />
+                            android:textSize="@dimen/sp_14" />
 
                         <TextView
                             android:id="@+id/tv_home_get_week"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text=""
-                            android:textColor="@color/textGray"
+                            android:textColor="@color/text_Gray"
                             android:textSize="@dimen/text_12" />
                     </LinearLayout>
                 </LinearLayout>
@@ -154,6 +154,7 @@
                     android:orientation="horizontal">
 
                     <TextView
+                        android:visibility="gone"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
@@ -180,14 +181,14 @@
                             android:gravity="center_vertical"
                             android:text=""
                             android:textColor="@color/colorMain"
-                            android:textSize="@dimen/text_12" />
+                            android:textSize="@dimen/sp_14" />
 
                         <TextView
                             android:id="@+id/tv_home_out_week"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text=""
-                            android:textColor="@color/textGray"
+                            android:textColor="@color/text_Gray"
                             android:textSize="@dimen/text_12" />
                     </LinearLayout>
                 </LinearLayout>

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

@@ -22,25 +22,25 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:background="@color/white"
                 android:descendantFocusability="beforeDescendants"
                 android:focusable="true"
                 android:focusableInTouchMode="true"
-                android:background="@color/white"
                 android:orientation="vertical">
 
                 <com.yuyife.banner.Banner
-                    android:layout_marginLeft="@dimen/dp_10"
-                    android:layout_marginRight="@dimen/dp_10"
-                    android:layout_marginTop="@dimen/size_80"
                     android:id="@+id/home_banner"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/size_170" />
+                    android:layout_height="@dimen/size_170"
+                    android:layout_marginLeft="@dimen/dp_10"
+                    android:layout_marginTop="@dimen/size_80"
+                    android:layout_marginRight="@dimen/dp_10" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal"
                     android:background="@color/white"
+                    android:orientation="horizontal"
                     android:paddingTop="@dimen/size_20"
                     android:paddingBottom="@dimen/dp_10"
                     android:weightSum="5">
@@ -54,16 +54,17 @@
                         android:orientation="vertical">
 
                         <ImageView
-                           android:src="@drawable/icon_home_recent"
                             android:layout_width="47dp"
-                           android:layout_height="47dp" />
+                            android:layout_height="47dp"
+                            android:src="@drawable/icon_home_recent" />
+
                         <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
                             android:layout_marginTop="@dimen/size_15"
-                           android:textSize="@dimen/sp_14"
-                           android:textColor="@color/textGray"
                             android:text="@string/rv_home_car_recent"
-                           android:layout_width="wrap_content"
-                           android:layout_height="wrap_content" />
+                            android:textColor="@color/textGray"
+                            android:textSize="@dimen/sp_14" />
                     </LinearLayout>
 
                     <LinearLayout
@@ -75,17 +76,17 @@
                         android:orientation="vertical">
 
                         <ImageView
-                            android:src="@drawable/icon_home_travel"
                             android:layout_width="47dp"
-                            android:layout_height="47dp" />
+                            android:layout_height="47dp"
+                            android:src="@drawable/icon_home_travel" />
 
                         <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
                             android:layout_marginTop="@dimen/size_15"
-                            android:textSize="@dimen/size_12"
-                            android:textColor="@color/textGray"
                             android:text="@string/rv_home_car_travel"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content" />
+                            android:textColor="@color/textGray"
+                            android:textSize="@dimen/size_12" />
                     </LinearLayout>
 
                     <LinearLayout
@@ -97,17 +98,19 @@
                         android:orientation="vertical">
 
                         <ImageView
-                            android:src="@drawable/icon_home_camp"
                             android:layout_width="47dp"
-                            android:layout_height="47dp" />
+                            android:layout_height="47dp"
+                            android:src="@drawable/icon_home_camp" />
+
                         <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
                             android:layout_marginTop="@dimen/size_15"
-                            android:textSize="@dimen/size_12"
-                            android:textColor="@color/textGray"
                             android:text="@string/rv_home_car_camp"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content" />
+                            android:textColor="@color/textGray"
+                            android:textSize="@dimen/size_12" />
                     </LinearLayout>
+
                     <LinearLayout
                         android:id="@+id/ll_car_discovery"
                         android:layout_width="0dp"
@@ -117,16 +120,17 @@
                         android:orientation="vertical">
 
                         <ImageView
-                            android:src="@drawable/icon_home_discovery"
                             android:layout_width="47dp"
-                            android:layout_height="47dp" />
+                            android:layout_height="47dp"
+                            android:src="@drawable/icon_home_discovery" />
+
                         <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
                             android:layout_marginTop="@dimen/size_15"
-                            android:textSize="@dimen/size_12"
-                            android:textColor="@color/textGray"
                             android:text="@string/rv_home_discovery"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content" />
+                            android:textColor="@color/textGray"
+                            android:textSize="@dimen/size_12" />
                     </LinearLayout>
 
                     <LinearLayout
@@ -138,48 +142,45 @@
                         android:orientation="vertical">
 
                         <ImageView
-                            android:src="@drawable/icon_home_buy"
                             android:layout_width="47dp"
-                            android:layout_height="47dp"/>
+                            android:layout_height="47dp"
+                            android:src="@drawable/icon_home_buy" />
+
                         <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
                             android:layout_marginTop="@dimen/size_15"
-                            android:textSize="@dimen/size_12"
-                            android:textColor="@color/textGray"
                             android:text="@string/rv_home_buy_car"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content" />
+                            android:textColor="@color/textGray"
+                            android:textSize="@dimen/size_12" />
                     </LinearLayout>
                 </LinearLayout>
 
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="@color/colorWrite"
-                    android:orientation="vertical"
-                    android:paddingTop="@dimen/size_20">
 
                 <RelativeLayout
+                    android:layout_marginLeft="@dimen/dp_10"
+                    android:layout_marginRight="@dimen/dp_10"
                     android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="27dp">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                            android:layout_marginLeft="@dimen/size_15"
                         android:text="@string/rv_home_title_hot_travle"
-                            android:textStyle="bold"
                         android:textColor="@color/colorMain"
-                            android:textSize="@dimen/text_16" />
+                        android:textSize="@dimen/text_16"
+                        android:textStyle="bold" />
 
                     <TextView
                         android:id="@+id/tv_hot_travel_more"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentRight="true"
-                            android:layout_centerVertical="true"
-                            android:layout_marginRight="@dimen/dp_10"
+                        android:layout_marginRight="@dimen/size_5"
                         android:drawableRight="@drawable/common_icon_rig_gray"
                         android:drawablePadding="@dimen/dp_4"
+                        android:paddingRight="5dp"
                         android:text="@string/rv_order_all_order"
                         android:textColor="@color/text_Gray"
                         android:textSize="@dimen/size_12" />
@@ -189,23 +190,26 @@
                 <android.support.v7.widget.RecyclerView
                     android:id="@+id/ry_home_hot_travel"
                     android:layout_width="match_parent"
-                        android:layout_height="@dimen/size_410"
-                        android:layout_marginTop="@dimen/size_10"
+                    android:layout_height="450dp"
+                    android:layout_marginTop="17dp"
                     android:paddingLeft="@dimen/size_10"
                     android:paddingRight="@dimen/size_10" />
 
                 <RelativeLayout
+                    android:layout_marginLeft="@dimen/dp_10"
+                    android:layout_marginRight="@dimen/dp_10"
                     android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/dp_10">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                            android:layout_marginLeft="@dimen/size_15"
+
                         android:text="@string/rv_home_title_camp"
                         android:textColor="@color/colorMain"
-                            android:textStyle="bold"
-                            android:textSize="@dimen/text_16" />
+                        android:textSize="@dimen/text_16"
+                        android:textStyle="bold" />
 
                     <TextView
                         android:id="@+id/tv_camp_more"
@@ -215,8 +219,8 @@
                         android:layout_centerVertical="true"
                         android:layout_marginRight="@dimen/size_5"
                         android:drawableRight="@drawable/common_icon_rig_gray"
-                            android:paddingRight="5dp"
                         android:drawablePadding="@dimen/dp_4"
+                        android:paddingRight="5dp"
                         android:text="@string/rv_order_all_order"
                         android:textColor="@color/text_Gray"
                         android:textSize="@dimen/size_12" />
@@ -226,37 +230,39 @@
                 <android.support.v7.widget.RecyclerView
                     android:id="@+id/ry_home_camp"
                     android:layout_width="match_parent"
-                        android:layout_height="@dimen/size_410"
-                        android:layout_marginTop="@dimen/size_10"
+                    android:layout_height="370dp"
+                    android:layout_marginTop="17dp"
                     android:paddingLeft="@dimen/size_10"
                     android:paddingRight="@dimen/size_10" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/size_20"
-                        android:paddingLeft="@dimen/size_15"
+                    android:layout_marginTop="27dp"
+                    android:layout_marginLeft="@dimen/dp_10"
                     android:text="精选活动"
                     android:textColor="@color/colorMain"
-                        android:textSize="@dimen/text_18" />
+                    android:textSize="@dimen/text_18"
+                    android:textStyle="bold" />
 
                 <LinearLayout
                     android:id="@+id/ll_home_item_activity_all"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/size_10"
-                        android:layout_marginBottom="@dimen/size_10"
+                    android:layout_marginTop="6dp"
+                    android:layout_marginBottom="13dp"
                     android:gravity="center_vertical"
                     android:orientation="horizontal"
-                        android:paddingLeft="@dimen/size_15"
-                        android:paddingRight="@dimen/size_15">
+                    android:paddingLeft="@dimen/dp_10"
+                    android:paddingRight="@dimen/dp_10">
 
                     <TextView
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:text="小编精选，最好玩的活动都在这里"
-                            android:textSize="@dimen/text_10" />
+                        android:textColor="@color/text_Gray"
+                        android:textSize="@dimen/sp_12" />
 
                     <TextView
                         android:layout_width="wrap_content"
@@ -264,43 +270,45 @@
                         android:drawableRight="@drawable/common_icon_rig_black_gray"
                         android:drawablePadding="@dimen/size_5"
                         android:text="全部"
-                            android:textSize="@dimen/text_10"
-                            android:visibility="gone" />
+                        android:textColor="@color/text_Gray"
+                        android:textSize="@dimen/size_12" />
                 </LinearLayout>
 
                 <android.support.v7.widget.RecyclerView
                     android:id="@+id/recyclerView_home_activity"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                        android:paddingLeft="@dimen/size_15"
-                        android:paddingRight="@dimen/size_15" />
+                    android:paddingLeft="@dimen/dp_10"
+                    android:paddingRight="@dimen/dp_10" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/size_30"
-                        android:paddingLeft="@dimen/size_15"
-                        android:paddingRight="@dimen/size_15"
+                    android:layout_marginTop="27dp"
+                    android:paddingLeft="@dimen/dp_10"
+                    android:paddingRight="@dimen/dp_10"
                     android:text="房车游榜单"
                     android:textColor="@color/colorMain"
-                        android:textSize="@dimen/text_18" />
+                    android:textSize="@dimen/text_18"
+                    android:textStyle="bold" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/size_10"
-                        android:layout_marginBottom="@dimen/size_10"
-                        android:paddingLeft="@dimen/size_15"
-                        android:paddingRight="@dimen/size_15"
+                    android:layout_marginTop="6dp"
+                    android:layout_marginBottom="13dp"
+                    android:paddingLeft="@dimen/dp_10"
+                    android:paddingRight="@dimen/dp_10"
                     android:text="精选优质旅游路线，满足你的出行需求"
-                        android:textSize="@dimen/text_10" />
+                    android:textColor="@color/text_Gray"
+                    android:textSize="@dimen/sp_12" />
 
                 <RelativeLayout
                     android:layout_width="match_parent"
-                        android:layout_height="@dimen/size_200"
+                    android:layout_height="wrap_content"
                     android:orientation="vertical"
-                        android:paddingLeft="@dimen/size_15"
-                        android:paddingRight="@dimen/size_15">
+                    android:paddingLeft="@dimen/dp_10"
+                    android:paddingRight="@dimen/dp_10">
 
                     <android.support.v7.widget.RecyclerView
                         android:id="@+id/recyclerView_home_rvtourlist"
@@ -312,9 +320,9 @@
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/size_100"
                         android:layout_alignParentBottom="true"
-                            android:layout_marginBottom="@dimen/size_5" />
+                        android:layout_marginBottom="@dimen/size_5"
+                        android:visibility="gone" />
                 </RelativeLayout>
-                </LinearLayout>
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -325,27 +333,32 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/size_20"
-                        android:paddingLeft="@dimen/size_15"
-                        android:paddingRight="@dimen/size_15"
+                        android:layout_marginTop="27dp"
+                        android:paddingLeft="@dimen/dp_10"
+                        android:paddingRight="@dimen/dp_10"
                         android:text="房车发烧友"
                         android:textColor="@color/colorMain"
-                        android:textSize="@dimen/text_18" />
+                        android:textSize="@dimen/text_18"
+                        android:textStyle="bold" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/size_10"
-                        android:paddingLeft="@dimen/size_15"
-                        android:paddingRight="@dimen/size_15"
+                        android:layout_marginTop="6dp"
+                        android:layout_marginBottom="13dp"
+                        android:paddingLeft="@dimen/dp_10"
+                        android:paddingRight="@dimen/dp_10"
                         android:text="分享精彩时刻"
-                        android:textSize="@dimen/text_10" />
+                        android:textColor="@color/text_Gray"
+                        android:textSize="@dimen/sp_12" />
 
                     <android.support.v7.widget.RecyclerView
                         android:id="@+id/recyclerView_home_rv_enthusiast"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_alignParentBottom="true" />
+                        android:layout_alignParentBottom="true"
+                        android:paddingLeft="@dimen/size_10"
+                        android:paddingRight="@dimen/size_10" />
 
                 </LinearLayout>
             </LinearLayout>
@@ -381,8 +394,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginRight="@dimen/ui_dimen_common_small"
-                    android:textColor="@color/textGray"
                     android:text="东莞市"
+                    android:textColor="@color/textGray"
                     android:textSize="@dimen/text_16" />
 
                 <ImageView

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

@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:gravity="center_horizontal"
+    android:layout_marginBottom="@dimen/size_16"
     android:layout_height="wrap_content">
 
     <LinearLayout
@@ -21,7 +22,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/size_10"
             android:ellipsize="end"
-            android:maxLines="1"
+            android:maxLines="2"
             android:textColor="@color/textMain"
             android:textSize="@dimen/text_16" />
 
@@ -39,9 +40,10 @@
             android:id="@+id/tv_price"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/size_5"
+            android:layout_marginTop="@dimen/dp_10"
+            android:textStyle="bold"
             android:textColor="@color/colorAuxiliaryRed"
-            android:textSize="@dimen/text_16" />
+            android:textSize="@dimen/sp_14" />
     </LinearLayout>
 
 

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

@@ -34,11 +34,10 @@
             android:id="@+id/tv_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/size_5"
+            android:layout_marginTop="@dimen/dp_10"
             android:ellipsize="end"
             android:maxLines="2"
-            android:paddingLeft="@dimen/size_5"
-            android:paddingRight="@dimen/size_5"
+            android:paddingRight="@dimen/dp_10"
             android:text="行摄川西邂逅生命中未知的精彩"
             android:textColor="@color/colorMain"
             android:textSize="@dimen/text_14" />
@@ -61,8 +60,8 @@
 
                 <com.base.utils.ui.image.round.RoundImageView
                     android:id="@+id/iv_user_icon"
-                    android:layout_width="@dimen/size_15"
-                    android:layout_height="@dimen/size_15" />
+                    android:layout_width="@dimen/size_20"
+                    android:layout_height="@dimen/size_20" />
 
                 <TextView
                     android:id="@+id/tv_user_name"
@@ -71,8 +70,9 @@
                     android:ellipsize="end"
                     android:singleLine="true"
                     android:text=""
-                    android:layout_marginLeft="@dimen/size_3"
-                    android:textSize="@dimen/text_8" />
+                    android:textColor="@color/textGray"
+                    android:layout_marginLeft="@dimen/dp_4"
+                    android:textSize="@dimen/text_10" />
             </LinearLayout>
 
             <TextView
@@ -84,8 +84,8 @@
                 android:layout_marginLeft="@dimen/size_3"
                 android:layout_marginRight="@dimen/size_5"
                 android:text=""
-                android:textColor="@color/textGray"
-                android:textSize="@dimen/text_10" />
+                android:textColor="@color/text_Gray"
+                android:textSize="11sp" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file

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

 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
@@ -11,4 +11,15 @@
         android:layout_height="@dimen/size_150"
         android:scaleType="centerCrop"/>
 
-</LinearLayout>
+    <TextView
\ No newline at end of file
+        android:textStyle="bold"
+        android:id="@+id/tv_lab"
+        android:textColor="@color/white"
+        android:textSize="@dimen/sp_14"
+        android:layout_marginLeft="@dimen/size_15"
+        android:layout_marginBottom="@dimen/dp_10"
+        android:layout_gravity="bottom|left"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+</FrameLayout>
\ No newline at end of file