修改租车的一些图标

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

@@ -6,6 +6,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -49,6 +50,7 @@ import com.ruiwenliu.wrapper.util.permission.RxPermission;
 import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout;
 import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshView;
 import com.rv.component.utils.DateUtils;
+import com.rv.component.utils.DisplayUtil;
 import com.rv.component.utils.LogUtil;
 import com.rv.component.utils.MyUtils;
 import com.rv.component.utils.ObservableScrollView;
@@ -256,6 +258,9 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
         permissionProcess();
         setBanner();
         tvDay.setText(String.format("%1$s%2$s", copyDay, getContext().getString(R.string.rv_days)));
+        Drawable drawable = getResources().getDrawable(R.drawable.icon_day_times);
+        drawable.setBounds(0, 0, DisplayUtil.dip2px(getContext(), 25), DisplayUtil.dip2px(getContext(), 5));
+        tvDay.setCompoundDrawables(null, null, null, drawable);
         begDate = DateUtils.formatDate8(DateUtils.getCurDateTime());
         tvGetTime.setText(DateUtils.formatDate66(begDate));
         tvGetWeek.setText("周" + MyUtils.getWeek(DateUtils.getCurDate()));
@@ -795,7 +800,7 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
                         getCityName = requestData;
                         getCityId = data.getIntExtra("id", 0);
                         String getAddress = "%s(%s)";
-                        headTvGetShop.setText(String.format(getAddress, new String[]{companyName, getCityName}));
+                        headTvGetShop.setText(String.format(getAddress, new Object[]{companyName, getCityName}));
                         getLatitude = data.getDoubleExtra("latitude", 0);
                         getLongitude = data.getDoubleExtra("longitude", 0);
                         setRequestData(type, requestData, getLatitude, getLongitude);
@@ -805,7 +810,7 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
                         outCityName = requestData;
                         outCityId = data.getIntExtra("id", 0);
                         String outAddress = "%s(%s)";
-                        headTvOutShop.setText(String.format(outAddress, new String[]{companyName, outCityName}));
+                        headTvOutShop.setText(String.format(outAddress, new Object[]{companyName, outCityName}));
                         outLatitude = data.getDoubleExtra("latitude", 0);
                         outLongitude = data.getDoubleExtra("longitude", 0);
                         setRequestData(type, requestData, outLatitude, outLongitude);
@@ -948,7 +953,7 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
         if (bean.getData() != null && bean.getData().getTotalCount() > 0) {
             if (headTvGetShop != null) {
                 String getAdress = "%s(%s)";
-                headTvGetShop.setText(String.format(getAdress, new String[]{bean.getData().getData().get(0).getName(), getCityName}));
+                headTvGetShop.setText(String.format(getAdress, new Object[]{bean.getData().getData().get(0).getName(), getCityName}));
                 headTvGetShop.setTextColor(_mActivity.getResources().getColor(R.color.colorMain));
                 getLatitude = bean.getData().getData().get(0).getLatitude();
                 getLongitude = bean.getData().getData().get(0).getLongitude();
@@ -957,7 +962,7 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
 
             if (headTvOutShop != null) {
                 String getAdress = "%s(%s)";
-                headTvOutShop.setText(String.format(getAdress, new String[]{bean.getData().getData().get(0).getName(), outCityName}));
+                headTvOutShop.setText(String.format(getAdress, new Object[]{bean.getData().getData().get(0).getName(), outCityName}));
                 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/SelectShopActivity.java

@@ -2,6 +2,7 @@ package com.rv.home.rv.module.ui.main.home;
 
 import android.content.Context;
 import android.content.Intent;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.LinearLayoutManager;
@@ -28,6 +29,7 @@ import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.inter.OnViewHolder;
 import com.ruiwenliu.wrapper.util.UtilsManager;
 import com.ruiwenliu.wrapper.util.ViewHolder;
+import com.rv.component.utils.DisplayUtil;
 import com.rv.home.R;
 import com.rv.home.R2;
 import com.rv.home.rv.module.basic.BaseStatusActivity;
@@ -96,6 +98,10 @@ public class SelectShopActivity extends BaseStatusActivity<CommonPresenter> impl
             titleView.setTitle("选择还车公司");
         }
         titleView.setImageResource(R.id.iv_title_left, R.drawable.rv_common_icon_back_white);
+        Drawable drawable = getResources().getDrawable(R.drawable.icon_position);
+        drawable.setBounds(0, 0, DisplayUtil.dip2px(this, 12), DisplayUtil.dip2px(this, 15));
+        tvCurrentCity.setCompoundDrawables(drawable, null, null, null);
+        tvCurrentCity.setVisibility(View.VISIBLE);
         if (!TextUtils.isEmpty(cityName)) {
             tvCurrentCity.setText(cityName);
         }
@@ -282,7 +288,7 @@ public class SelectShopActivity extends BaseStatusActivity<CommonPresenter> impl
                     .address(cityName));
             mCityId = data.getIntExtra("id", 0);
             if (!TextUtils.isEmpty(cityName)) {
-                tvCurrentCity.setText("当前选择城市: " + cityName);
+                tvCurrentCity.setText(cityName);
             }
 //            getIntent().putExtra("type", mCityType);
             mPage = 1;

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

@@ -224,7 +224,7 @@
                                                     android:layout_width="wrap_content"
                                                     android:layout_height="wrap_content"
                                                     android:layout_centerHorizontal="true"
-                                                    android:drawableBottom="@color/colorLine"
+                                                    android:drawableBottom="@drawable/icon_day_times"
                                                     android:gravity="center"
                                                     android:text="3天"
                                                     android:textSize="@dimen/text_14" />

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

@@ -25,7 +25,8 @@
             android:layout_alignParentLeft="true"
             android:layout_centerVertical="true"
             android:background="@drawable/shape_bg_select_company_search_position"
-            android:drawableLeft="@drawable/icon_location"
+            android:drawableLeft="@drawable/icon_position"
+            android:drawablePadding="@dimen/size_3"
             android:ellipsize="end"
             android:gravity="center_vertical"
             android:minWidth="@dimen/size_100"