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

Banner/src/main/java/com/yuyife/banner/Banner.java

@@ -8,6 +8,7 @@ import android.util.AttributeSet;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.TypedValue;
+import android.view.Display;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
@@ -70,6 +71,7 @@ public class Banner extends FrameLayout implements OnPageChangeListener {
     private BannerScroller mScroller;
     private OnBannerListener listener;
     private DisplayMetrics dm;
+    private boolean isHome = false ;
 
     private WeakHandler handler = new WeakHandler();
 
@@ -250,6 +252,11 @@ public class Banner extends FrameLayout implements OnPageChangeListener {
         start();
     }
 
+    public Banner isHome(boolean b){
+        this.isHome = b ;
+        return this ;
+    }
+
     public void updateBannerStyle(int bannerStyle) {
         indicator.setVisibility(GONE);
         numIndicator.setVisibility(GONE);
@@ -295,7 +302,7 @@ public class Banner extends FrameLayout implements OnPageChangeListener {
         int visibility =count > 1 ? View.VISIBLE : View.GONE;
         switch (bannerStyle) {
             case BannerConfig.CIRCLE_INDICATOR:
-                indicator.setVisibility(visibility);
+//                indicator.setVisibility(visibility);
                 break;
             case BannerConfig.NUM_INDICATOR:
                 numIndicator.setVisibility(visibility);
@@ -305,7 +312,7 @@ public class Banner extends FrameLayout implements OnPageChangeListener {
                 setTitleStyleUI();
                 break;
             case BannerConfig.CIRCLE_INDICATOR_TITLE:
-                indicator.setVisibility(visibility);
+//                indicator.setVisibility(visibility);
                 setTitleStyleUI();
                 break;
             case BannerConfig.CIRCLE_INDICATOR_TITLE_INSIDE:
@@ -344,8 +351,10 @@ public class Banner extends FrameLayout implements OnPageChangeListener {
             if (imageView == null) {
                 imageView = new ImageView(context);
             }
+            imageView.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)) ;
+
             setScaleType(imageView);
-            Object url = null;
+            Object url ;
             if (i == 0) {
                 url = imagesUrl.get(count - 1);
             } else if (i == count + 1) {
@@ -353,7 +362,16 @@ public class Banner extends FrameLayout implements OnPageChangeListener {
             } else {
                 url = imagesUrl.get(i - 1);
             }
+            if(isHome){
+                LinearLayout layout = new LinearLayout(context);
+                layout.setOrientation(LinearLayout.VERTICAL);
+                layout.setPadding(30, 0, 30, 0);
+                layout.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)) ;
+                layout.addView(imageView);
+                imageViews.add(layout);
+            }else {
                 imageViews.add(imageView);
+            }
             if (imageLoader != null)
                 imageLoader.displayImage(context, url, imageView);
             else

Banner/src/main/java/com/yuyife/banner/BannerConfig.java

@@ -23,7 +23,7 @@ public class BannerConfig {
      */
     public static final int PADDING_SIZE = 5;
     public static final int TIME = 2000;
-    public static final int DURATION = 800;
+    public static final int DURATION = 300;
     public static final boolean IS_AUTO_PLAY = true;
     public static final boolean IS_SCROLL = true;
 

Banner/src/main/res/drawable/icon_show.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#ffffb74b" />
+    <corners
+        android:bottomLeftRadius="10dp"
+        android:bottomRightRadius="10dp"
+        android:topLeftRadius="10dp"
+        android:topRightRadius="10dp" />
+</shape>
\ No newline at end of file

Banner/src/main/res/drawable/icon_unshow.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid
+        android:color="#ffffff"/>
+    <corners android:radius="10dp" />
+    <stroke android:color="#ffffb74b" android:width="1px" />
+</shape>
\ No newline at end of file

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

+package com.ruiwenliu.wrapper.util;
+
+import android.graphics.Bitmap;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+
+import com.bumptech.glide.request.target.ImageViewTarget;
+
+public class TransformationUtil3 extends ImageViewTarget<Bitmap> {
+
+    private ImageView target;
+
+    public TransformationUtil3(ImageView target) {
+        super(target);
+        this.target = target;
+    }
+
+    @Override
+    protected void setResource(Bitmap resource) {
+        target.setImageBitmap(resource);
+
+        if (resource == null) return;
+        //获取原图的宽高
+        int width = resource.getWidth();
+        int height = resource.getHeight();
+
+        //获取imageView的宽
+        int imageViewWidth = target.getWidth();
+        int imageViewHeight = 0;
+        if((width*0.1f)/(height*0.1f) < 0.75){
+            //计算图片等比例放大后的高
+            imageViewHeight = 2*imageViewWidth;
+        }else{
+            imageViewHeight = imageViewWidth ;
+        }
+
+        ViewGroup.LayoutParams params = target.getLayoutParams();
+        params.height = imageViewHeight;
+        target.setLayoutParams(params);
+    }
+}
\ No newline at end of file

module_camp/src/main/res/layout/activity_camp.xml

@@ -22,7 +22,7 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/size_55"
+                android:layout_height="@dimen/size_50"
                 android:background="@color/colorWrite"
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
@@ -33,24 +33,33 @@
                     android:layout_height="match_parent"
                     android:layout_centerVertical="true"
                     android:layout_marginLeft="@dimen/size_15"
-                    android:drawableRight="@drawable/camp_open_member"
-                    android:drawablePadding="@dimen/size_10"
+                    android:drawableRight="@drawable/home_icon_downward"
+                    android:drawablePadding="@dimen/size_5"
                     android:gravity="center_vertical"
                     android:text="类型"
-                    android:textColor="@color/textMain"
-                    android:textSize="@dimen/text_16" />
+                    android:textColor="@color/textGray"
+                    android:textSize="@dimen/sp_14" />
 
 
                 <LinearLayout
                     android:id="@+id/ll_item_search"
                     android:layout_width="0dp"
-                    android:layout_height="@dimen/size_40"
+                    android:layout_height="@dimen/dp_40"
                     android:layout_marginLeft="@dimen/size_8"
                     android:layout_marginRight="@dimen/size_5"
                     android:layout_weight="1"
+                    android:gravity="center"
                     android:background="@drawable/shape_rv_travel_search_line"
                     android:orientation="horizontal">
 
+                    <ImageView
+                        android:id="@+id/iv_home_search_input_hint"
+                        android:layout_width="15dp"
+                        android:layout_height="15dp"
+                        android:layout_marginLeft="@dimen/size_15"
+                        android:layout_marginRight="@dimen/ui_dimen_common_small"
+                        android:src="@drawable/common_icon_search" />
+
                     <TextView
                         android:id="@+id/search_input"
                         android:layout_width="0dp"
@@ -59,22 +68,22 @@
                         android:background="@null"
                         android:gravity="center_vertical"
                         android:hint="搜索营地"
-                        android:paddingLeft="@dimen/size_15"
-                        android:paddingRight="@dimen/size_15"
-                        android:textColor="@color/colorMain"
+                        android:paddingLeft="@dimen/ui_dimen_common"
+                        android:paddingRight="@dimen/ui_dimen_padding_h1"
+                        android:textColor="@color/colorGray"
                         android:textColorHint="@color/colorGray"
-                        android:textSize="@dimen/text_12" />
+                        android:textSize="@dimen/sp_14" />
                 </LinearLayout>
 
 
                 <ImageView
                     android:id="@+id/iv_camp_map"
-                    android:layout_width="@dimen/size_35"
-                    android:layout_height="@dimen/size_35"
+                    android:layout_width="@dimen/size_30"
+                    android:layout_height="@dimen/size_30"
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
-                    android:layout_marginRight="@dimen/size_15"
-                    android:padding="@dimen/size_8"
+                    android:layout_marginRight="@dimen/size_5"
+                    android:padding="@dimen/size_5"
                     android:src="@drawable/camp_rentingcar_icon_plat" />
 
             </LinearLayout>

module_discovery/src/main/java/com/xxfc/discovery/adapter/DiscoveryPostPatAdapter.java

@@ -57,4 +57,6 @@ public class DiscoveryPostPatAdapter extends RecyclerView.Adapter<DiscoveryPostP
             imageView = itemView.findViewById(R.id.iv_icon);
         }
     }
+
+
 }
\ No newline at end of file

module_discovery/src/main/java/com/xxfc/discovery/adapter/DiscoveryRecommendAdapter.java

@@ -15,9 +15,11 @@ import com.bumptech.glide.request.transition.Transition;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.ruiwenliu.wrapper.util.TransformationUtil;
+import com.ruiwenliu.wrapper.util.TransformationUtil3;
 import com.ruiwenliu.wrapper.util.glide.GlideManager;
 import com.ruiwenliu.wrapper.util.glide.GlideOptions;
 import com.ruiwenliu.wrapper.util.glide.GlideRoundTransform;
+import com.rv.component.utils.DisplayUtil;
 import com.xxfc.discovery.R;
 import com.xxfc.discovery.bean.DiscoveryRecommendBean;
 import com.xxfc.imcamera.photopicker.Image;
@@ -63,12 +65,12 @@ public class DiscoveryRecommendAdapter extends BaseQuickAdapter<DiscoveryDataBea
                 ImageView image = helper.getView(R.id.iv_icon_pat);
                 GlideOptions options = GlideOptions.placeholderOf(com.ruiwenliu.wrapper.R.drawable.glide_icon_placeholder).
                         error(com.ruiwenliu.wrapper.R.drawable.glide_icon_error);
-                TransformationUtil utils = new TransformationUtil(image);
+                TransformationUtil3 utils = new TransformationUtil3(image);
                 Glide.with(mContext)
                         .asBitmap()
                         .load(body.getImages().get(0).getOurl())
                         .apply(options)
-                        .apply(RequestOptions.bitmapTransform(new RoundedCorners(12)).override(image.getWidth(), image.getHeight()))
+                        .apply(RequestOptions.bitmapTransform(new RoundedCorners(DisplayUtil.dip2px(mContext,6))))
                         .into(utils);
             }
             helper.setText(R.id.tv_title, body.getText());
@@ -81,7 +83,7 @@ public class DiscoveryRecommendAdapter extends BaseQuickAdapter<DiscoveryDataBea
         helper.setText(R.id.tv_user_name, item.getNickname());
         GlideManager.getInstance(mContext).loadImage(item.getPicUrl(), (ImageView) helper.getView(R.id.iv_user_icon));
         if (item.getCount() != null) {
-            helper.setText(R.id.iv_like_number, "点赞数  " + item.getCount().getPraise());
+            helper.setText(R.id.iv_like_number, "点赞数  " + getPraise(item.getCount()));
         }
         if (1 == item.getIsPraise()) { //0：未点赞 1：已点赞
             helper.setTextColor(R.id.iv_like_number, mContext.getResources().getColor(R.color.gray_FFB74B));
@@ -89,4 +91,22 @@ public class DiscoveryRecommendAdapter extends BaseQuickAdapter<DiscoveryDataBea
             helper.setTextColor(R.id.iv_like_number, mContext.getResources().getColor(R.color.textGray));
         }
     }
+
+    private String getPraise(DiscoveryDataBean.Count count) {
+        StringBuilder builder = new StringBuilder();
+        try {
+            int praise = Integer.valueOf(count.getPraise()).intValue();
+            if (praise < 999) {
+                builder.append(count.getPraise());
+            } else if (praise < 9999) {
+                builder.append(praise / 1000 + "." + praise % 1000 / 100 + "k");
+            } else {
+                builder.append(praise / 10000 + "." + praise % 10000 / 1000 + "w");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return "";
+        }
+        return builder.toString();
+    }
 }

module_discovery/src/main/java/com/xxfc/discovery/adapter/DiscoveryShortVideoAdapter.java

@@ -4,12 +4,15 @@ import android.widget.ImageView;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
+import com.bumptech.glide.load.resource.bitmap.TransformationUtils;
 import com.bumptech.glide.request.RequestOptions;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.ruiwenliu.wrapper.util.TransformationUtil;
+import com.ruiwenliu.wrapper.util.TransformationUtil3;
 import com.ruiwenliu.wrapper.util.glide.GlideManager;
 import com.ruiwenliu.wrapper.util.glide.GlideOptions;
+import com.rv.component.utils.DisplayUtil;
 import com.xxfc.discovery.R;
 import com.xxrv.video.bean.circle.DiscoveryDataBean;
 
@@ -36,7 +39,7 @@ public class DiscoveryShortVideoAdapter extends BaseQuickAdapter<DiscoveryDataBe
                 ImageView image = helper.getView(R.id.iv_icon_video);
                 GlideOptions options = GlideOptions.placeholderOf(com.ruiwenliu.wrapper.R.drawable.glide_icon_placeholder).
                         error(com.ruiwenliu.wrapper.R.drawable.glide_icon_error);
-                TransformationUtil utils = new TransformationUtil(image);
+                TransformationUtil3 utils = new TransformationUtil3(image);
                 Glide.with(mContext)
                         .setDefaultRequestOptions(
                                 new RequestOptions()
@@ -46,7 +49,7 @@ public class DiscoveryShortVideoAdapter extends BaseQuickAdapter<DiscoveryDataBe
                         .asBitmap()
                         .load(item.getFirstImageOriginal())
                         .apply(options)
-                        .apply(RequestOptions.bitmapTransform(new RoundedCorners(12)).override(image.getWidth(), image.getHeight()))
+                        .apply(RequestOptions.bitmapTransform(new RoundedCorners(DisplayUtil.dip2px(mContext,6))))
                         .into(utils);
             }
             helper.setText(R.id.tv_title, body.getText());
@@ -59,7 +62,7 @@ public class DiscoveryShortVideoAdapter extends BaseQuickAdapter<DiscoveryDataBe
         helper.setText(R.id.tv_user_name, item.getNickname());
         GlideManager.getInstance(mContext).loadImage(item.getPicUrl(), (ImageView) helper.getView(R.id.iv_user_icon));
         if (item.getCount() != null) {
-            helper.setText(R.id.iv_like_number, "点赞数  " + item.getCount().getPraise());
+            helper.setText(R.id.iv_like_number, "点赞数  " + getPraise(item.getCount()));
         }
         if (1 == item.getIsPraise()) { //0：未点赞 1：已点赞
             helper.setTextColor(R.id.iv_like_number, mContext.getResources().getColor(R.color.gray_FFB74B));
@@ -67,4 +70,22 @@ public class DiscoveryShortVideoAdapter extends BaseQuickAdapter<DiscoveryDataBe
             helper.setTextColor(R.id.iv_like_number, mContext.getResources().getColor(R.color.textGray));
         }
     }
+
+    private String getPraise(DiscoveryDataBean.Count count) {
+        StringBuilder builder = new StringBuilder();
+        try {
+            int praise = Integer.valueOf(count.getPraise()).intValue();
+            if (praise < 999) {
+                builder.append(count.getPraise());
+            } else if (praise < 9999) {
+                builder.append(praise / 1000 + "." + praise % 1000 / 100 + "k");
+            } else {
+                builder.append(praise / 10000 + "." + praise % 10000 / 1000 + "w");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return "";
+        }
+        return builder.toString();
+    }
 }

module_discovery/src/main/res/layout/rv_item_discovery_recommend.xml

@@ -18,7 +18,8 @@
             <ImageView
                 android:id="@+id/iv_icon_pat"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+                android:layout_height="wrap_content"
+                android:scaleType="fitXY"/>
 
             <ImageView
                 android:id="@+id/iv_isvideo"

module_discovery/src/main/res/layout/rv_item_discovery_short_video.xml

@@ -16,6 +16,7 @@
             android:layout_height="wrap_content">
 
             <ImageView
+                android:scaleType="fitXY"
                 android:id="@+id/iv_icon_video"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />

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

@@ -11,6 +11,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.ruiwenliu.wrapper.util.BaseGlideHolder;
 import com.ruiwenliu.wrapper.util.TransformationUtil2;
 import com.ruiwenliu.wrapper.util.glide.GlideOptions;
+import com.rv.component.utils.DisplayUtil;
 import com.rv.home.R;
 import com.rv.home.rv.module.ui.main.home.bean.HomeHotGoodListBean;
 
@@ -40,7 +41,7 @@ public class HotCarTypeAdapter extends BaseQuickAdapter<HomeHotGoodListBean.Data
                 .asBitmap()
                 .load(bean.getIcon())
                 .apply(options)
-                .apply(RequestOptions.bitmapTransform(new RoundedCorners(12)).override(image.getWidth(), image.getHeight()))
+                .apply(RequestOptions.bitmapTransform(new RoundedCorners(DisplayUtil.dip2px(mContext,6))).override(image.getWidth(), image.getHeight()))
                 .into(utils);
 
         helper.setText(R.id.tv_name, bean.getName());

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

@@ -8,8 +8,10 @@ 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.TransformationUtil3;
 import com.ruiwenliu.wrapper.util.glide.GlideManager;
 import com.ruiwenliu.wrapper.util.glide.GlideOptions;
+import com.rv.component.utils.DisplayUtil;
 import com.rv.home.R;
 import com.rv.home.rv.module.ui.main.home.bean.HomeRecommendBean;
 import com.xxrv.video.bean.circle.DiscoveryDataBean;
@@ -31,12 +33,12 @@ public class RVEnthusiastAdapter extends BaseQuickAdapter<DiscoveryDataBean, Bas
                 ImageView image = helper.getView(R.id.iv_icon_pat);
                 GlideOptions options = GlideOptions.placeholderOf(com.ruiwenliu.wrapper.R.drawable.glide_icon_placeholder).
                         error(com.ruiwenliu.wrapper.R.drawable.glide_icon_error);
-                TransformationUtil utils = new TransformationUtil(image);
+                TransformationUtil3 utils = new TransformationUtil3(image);
                 Glide.with(mContext)
                         .asBitmap()
                         .load(body.getImages().get(0).getOurl())
                         .apply(options)
-                        .apply(RequestOptions.bitmapTransform(new RoundedCorners(12)).override(image.getWidth(), image.getHeight()))
+                        .apply(RequestOptions.bitmapTransform(new RoundedCorners(DisplayUtil.dip2px(mContext,6))))
                         .into(utils);
             }
 
@@ -50,7 +52,7 @@ public class RVEnthusiastAdapter extends BaseQuickAdapter<DiscoveryDataBean, Bas
         helper.setText(R.id.tv_user_name, item.getNickname());
         GlideManager.getInstance(mContext).loadImage(item.getPicUrl(), (ImageView) helper.getView(R.id.iv_user_icon));
         if (item.getCount() != null) {
-            helper.setText(R.id.iv_like_number, "点赞数  " + item.getCount().getPraise());
+            helper.setText(R.id.iv_like_number, "点赞数  " + getPraise(item.getCount()));
         }
         if (1 == item.getIsPraise()) { //0：未点赞 1：已点赞
             helper.setTextColor(R.id.iv_like_number, mContext.getResources().getColor(R.color.gray_FFB74B));
@@ -58,4 +60,22 @@ public class RVEnthusiastAdapter extends BaseQuickAdapter<DiscoveryDataBean, Bas
             helper.setTextColor(R.id.iv_like_number, mContext.getResources().getColor(R.color.textGray));
         }
     }
+
+    private String getPraise(DiscoveryDataBean.Count count) {
+        StringBuilder builder = new StringBuilder();
+        try {
+            int praise = Integer.valueOf(count.getPraise()).intValue();
+            if (praise < 999) {
+                builder.append(count.getPraise());
+            } else if (praise < 9999) {
+                builder.append(praise / 1000 + "." + praise % 1000 / 100 + "k");
+            } else {
+                builder.append(praise / 10000 + "." + praise % 10000 / 1000 + "w");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return "";
+        }
+        return builder.toString();
+    }
 }

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

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

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

@@ -198,10 +198,11 @@
             <Button
                 android:id="@+id/tv_home_select_car"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/size_50"
+                android:layout_height="@dimen/dp_40"
                 android:background="@drawable/shape_rv_bg_shallow_dark_yellow_circle"
                 android:gravity="center"
                 android:text="立即选车"
+                style="?android:attr/borderlessButtonStyle"
                 android:textColor="@color/colorWrite"
                 android:textSize="@dimen/text_16" />
         </LinearLayout>

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

@@ -18,7 +18,8 @@
             <ImageView
                 android:id="@+id/iv_icon_pat"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+                android:layout_height="wrap_content"
+                android:scaleType="fitXY"/>
 
             <ImageView
                 android:id="@+id/iv_isvideo"
@@ -47,8 +48,7 @@
             android:layout_height="wrap_content"
             android:orientation="horizontal"
             android:layout_marginTop="@dimen/size_5"
-            android:layout_marginBottom="@dimen/size_10"
-            android:paddingLeft="@dimen/size_5">
+            android:layout_marginBottom="@dimen/size_10">
 
             <LinearLayout
                 android:layout_width="0dp"
@@ -81,11 +81,9 @@
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
-                android:layout_marginLeft="@dimen/size_3"
-                android:layout_marginRight="@dimen/size_5"
                 android:text=""
                 android:textColor="@color/text_Gray"
-                android:textSize="11sp" />
+                android:textSize="@dimen/sp_12" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file

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

@@ -10,17 +10,18 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
+
         <com.ruiwenliu.wrapper.statusbar.StatusBarHeightView
+            android:id="@+id/ll_home_item_title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@color/colorWrite"
+            android:background="@color/white"
             android:orientation="vertical"
             app:use_type="use_padding_top">
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/size_60"
-                android:background="@color/colorWrite"
+                android:layout_height="@dimen/size_50"
                 android:gravity="center"
                 android:orientation="horizontal">
 
@@ -28,7 +29,7 @@
                     android:id="@+id/travel_city_layout"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:layout_marginLeft="@dimen/size_15"
+                    android:layout_marginLeft="@dimen/dp_10"
                     android:clickable="true"
                     android:gravity="center"
                     android:orientation="horizontal">
@@ -37,55 +38,63 @@
                         android:id="@+id/travel_city_text"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginRight="@dimen/size_3"
+                        android:layout_marginRight="@dimen/ui_dimen_common_small"
                         android:text="东莞市"
-                        android:textColor="@color/colorMain"
-                        android:textSize="@dimen/text_16" />
+                        android:textColor="@color/textGray"
+                        android:textSize="@dimen/sp_14" />
 
                     <ImageView
+                        android:id="@+id/iv_home_travel_city_text_hint"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:src="@drawable/rv_common_icon_up_arrow" />
+                        android:src="@drawable/home_icon_downward" />
                 </LinearLayout>
 
-
                 <LinearLayout
                     android:id="@+id/ll_item_search"
                     android:layout_width="0dp"
-                    android:layout_height="@dimen/size_40"
-                    android:layout_marginLeft="@dimen/size_10"
+                    android:layout_height="@dimen/dp_40"
+                    android:layout_margin="@dimen/ui_dimen_common"
                     android:layout_weight="1"
                     android:background="@drawable/shape_rv_textview_home_search"
                     android:gravity="center"
                     android:orientation="horizontal">
 
 
+                    <ImageView
+                        android:id="@+id/iv_home_search_input_hint"
+                        android:layout_width="15dp"
+                        android:layout_height="15dp"
+                        android:layout_marginLeft="@dimen/size_15"
+                        android:layout_marginRight="@dimen/ui_dimen_common_small"
+                        android:src="@drawable/common_icon_search" />
+
                     <TextView
                         android:id="@+id/search_input"
                         android:layout_width="0dp"
-                        android:layout_height="@dimen/size_40"
+                        android:layout_height="match_parent"
                         android:layout_weight="1"
                         android:background="@null"
                         android:gravity="center_vertical"
                         android:hint="搜索目的地/旅游线"
-                        android:paddingLeft="@dimen/size_15"
-                        android:paddingRight="@dimen/size_15"
-                        android:textColor="@color/colorMain"
+                        android:paddingLeft="@dimen/ui_dimen_common"
+                        android:paddingRight="@dimen/ui_dimen_padding_h1"
+                        android:textColor="@color/colorGray"
                         android:textColorHint="@color/colorGray"
-                        android:textSize="@dimen/text_12" />
-
+                        android:textSize="@dimen/sp_14" />
                 </LinearLayout>
 
                 <ImageView
                     android:id="@+id/travel_server_image"
-                    android:layout_width="@dimen/size_50"
-                    android:layout_height="@dimen/size_35"
-                    android:paddingLeft="@dimen/size_15"
-                    android:paddingRight="@dimen/size_15"
+                    android:layout_width="@dimen/size_30"
+                    android:layout_height="@dimen/size_30"
+                    android:layout_marginRight="@dimen/size_5"
+                    android:padding="@dimen/size_5"
+                    android:paddingRight="@dimen/ui_dimen_common"
                     android:scaleType="centerInside"
                     android:src="@drawable/common_journey_service_gray" />
-            </LinearLayout>
 
+            </LinearLayout>
         </com.ruiwenliu.wrapper.statusbar.StatusBarHeightView>
 
         <include layout="@layout/common_line" />

plugin_search/src/main/res/layout/activity_travel_search.xml

@@ -8,7 +8,6 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="@dimen/size_50"
-        android:layout_marginTop="@dimen/size_10"
         android:gravity="center_vertical"
         android:orientation="horizontal">