bug修复

RvWrapper/src/main/java/com/ruiwenliu/wrapper/dialog/BasePopupWindow.java

@@ -37,7 +37,7 @@ public abstract class BasePopupWindow extends PopupWindow implements OnViewHolde
         setClippingEnabled(false);
         setOutsideTouchable(false);
         setFocusable(false);
-        setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(getDialogContext(), R.color.bgAlpha)));
+        setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(getDialogContext(), R.color.gray_50ffffff)));
         setContentView(getHelperView(null, getViewLayout(), this));
     }
 

RvWrapper/src/main/res/values/colors.xml

@@ -32,6 +32,7 @@
     <color name="gray_FFB74B">#FFB74B</color>
     <color name="gray_F96363">#F96363</color>
     <color name="gray_50ffffff">#50ffffff</color>
+    <color name="gray_60ffffff">#60ffffff</color>
     <color name="gray_707070">#707070</color>
     <color name="gray_50000000">#50000000</color>
     <color name="gray_EEEEEE">#EEEEEE</color>

module_discovery/src/main/java/com/xxfc/discovery/DiscoveryFragment.java

 package com.xxfc.discovery;
 
 import android.content.Intent;
+import android.graphics.drawable.BitmapDrawable;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.view.ViewPager;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.PopupWindow;
+
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.ruiwenliu.wrapper.adapter.TabAdapter;
 import com.ruiwenliu.wrapper.base.BaseBean;
@@ -20,13 +22,13 @@ import com.xxfc.discovery.fragment.PatFragment;
 import com.xxfc.discovery.fragment.QuestionAndAnswerFragment;
 import com.xxfc.discovery.fragment.RecommendFragment;
 import com.xxfc.discovery.fragment.ShortVideoFragment;
+import com.xxfc.discovery.popupwindow.AddDiscoveryContentPw;
 import com.xxfc.discovery.presenter.DiscoveryPresenter;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
 import butterknife.OnClick;
 import butterknife.Unbinder;
 
@@ -40,6 +42,8 @@ public class DiscoveryFragment extends BaseFragment<DiscoveryPresenter> {
     @BindView(R2.id.order_viewPager)
     ViewPager mViewPager;
     Unbinder unbinder;
+    @BindView(R2.id.iv_discovery_content_add)
+    ImageView ivDiscoveryContentAdd;
 
     private DiscoveryMenuAdapter menuAdapter;
     private TabAdapter mAdapter;
@@ -49,6 +53,9 @@ public class DiscoveryFragment extends BaseFragment<DiscoveryPresenter> {
     public final static int TYPE_QUESTION_AND_ANSWER = 3;//问题
     private int menuPosition;
 
+    private AddDiscoveryContentPw mPop;
+    private boolean isShow = true;
+
 
     public static DiscoveryFragment getInstance(int type) {
         Bundle bundl = new Bundle();
@@ -80,7 +87,6 @@ public class DiscoveryFragment extends BaseFragment<DiscoveryPresenter> {
 
     }
 
-
     /**
      * 初始化RecyclerView
      */
@@ -160,26 +166,13 @@ public class DiscoveryFragment extends BaseFragment<DiscoveryPresenter> {
         }
     };
 
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        // TODO: inflate a fragment view
-        View rootView = super.onCreateView(inflater, container, savedInstanceState);
-        unbinder = ButterKnife.bind(this, rootView);
-        return rootView;
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        unbinder.unbind();
-    }
 
     @OnClick({R2.id.iv_discovery_content_add})
     public void onViewClicked(View view) {
         int id = view.getId();
-        if (id == R.id.iv_discovery_content_add){
+        if (id == R.id.iv_discovery_content_add) {
             //添加
-
+            showPopupWindow(ivDiscoveryContentAdd);
         }
     }
 
@@ -190,4 +183,30 @@ public class DiscoveryFragment extends BaseFragment<DiscoveryPresenter> {
         void switchTab(int position);
     }
 
+    /**
+     * 展示menu属性 窗体
+     */
+    private void showPopupWindow(final View view) {
+        if (mPop == null) {
+            mPop = new AddDiscoveryContentPw(_mActivity);
+        }
+        mPop.setTouchable(true); // 设置popupwindow可点击
+        mPop.setBackgroundDrawable(new BitmapDrawable());
+        mPop.setOutsideTouchable(true);
+        mPop.update();
+
+        if (isShow) {
+            mPop.showPopupWindow(view);
+        }else {
+            mPop.dismiss();
+        }
+        isShow = !isShow;
+
+        mPop.setOnDismissListener(new PopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                isShow = true;
+            }
+        });
+    }
 }

module_discovery/src/main/java/com/xxfc/discovery/popupwindow/AddDiscoveryContentPw.java

@@ -4,9 +4,8 @@ import android.app.Activity;
 import android.graphics.Rect;
 import android.os.Build;
 import android.support.annotation.NonNull;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.view.View;
+import android.view.ViewGroup;
 
 import com.ruiwenliu.wrapper.dialog.BasePopupWindow;
 import com.ruiwenliu.wrapper.util.ViewHolder;
@@ -19,7 +18,9 @@ public class AddDiscoveryContentPw extends BasePopupWindow {
 
     public AddDiscoveryContentPw(@NonNull Activity context) {
         super(context);
-        setOutsideTouchable(false);
+        setOutsideTouchable(true);
+        setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
+        setWidth(ViewGroup.LayoutParams.WRAP_CONTENT);
     }
 
     @Override
@@ -30,14 +31,29 @@ public class AddDiscoveryContentPw extends BasePopupWindow {
     @Override
     public void helper(ViewHolder helper) {
         super.helper(helper);
-        helper.setOnClickListener(R.id.fl_dismiss, new View.OnClickListener() {
+        //拍拍
+        helper.setOnClickListener(R.id.tv_pat, new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                dismiss();
+                   dismiss();
+            }
+        });
+
+        //短视频
+        helper.setOnClickListener(R.id.tv_short_video, new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                   dismiss();
+            }
+        });
+
+        //去提问
+        helper.setOnClickListener(R.id.tv_ask_questions, new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                   dismiss();
             }
         });
-        RecyclerView recyclerView = helper.getView(R.id.recyclerView);
-        recyclerView.setLayoutManager(new LinearLayoutManager(getDialogContext()));
     }
 
     /**
@@ -48,11 +64,11 @@ public class AddDiscoveryContentPw extends BasePopupWindow {
         if (Build.VERSION.SDK_INT >= 24) {
             Rect visibleFrame = new Rect();
             anchor.getGlobalVisibleRect(visibleFrame);
-            int height = anchor.getResources().getDisplayMetrics().heightPixels - visibleFrame.bottom;
-            this.setHeight(height);
-            this.showAsDropDown(anchor, 0, 0);
+//            int height = anchor.getResources().getDisplayMetrics().heightPixels - visibleFrame.bottom;
+//            this.setHeight(height);
+            this.showAsDropDown(anchor, -170, 0);
         } else {
-            this.showAsDropDown(anchor, 0, 0);
+            this.showAsDropDown(anchor, -170, 0);
         }
     }
 

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

 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
     android:orientation="vertical">
 
     <FrameLayout
-        android:layout_width="match_parent"
+        android:background="@drawable/icon_pop_add_discovery_content_bg"
+        android:layout_width="@dimen/size_130"
         android:layout_height="wrap_content">
 
         <LinearLayout
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="@dimen/size_10"
             android:orientation="vertical">
 
+            <TextView
+                android:id="@+id/tv_pat"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textSize="@dimen/text_16"
+                android:gravity="center_horizontal"
+                android:layout_gravity="center_horizontal"
+                android:textColor="@color/textGray"
+                android:paddingTop="@dimen/size_10"
+                android:paddingBottom="@dimen/size_10"
+                android:text="拍 拍"/>
 
-        </LinearLayout>
-    </FrameLayout>
+            <include layout="@layout/common_line"/>
+
+            <TextView
+                android:id="@+id/tv_short_video"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textSize="@dimen/text_16"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center_horizontal"
+                android:paddingTop="@dimen/size_10"
+                android:paddingBottom="@dimen/size_10"
+                android:textColor="@color/textGray"
+                android:text="短视频"/>
 
-    <View
-        android:id="@+id/fl_dismiss"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+            <include layout="@layout/common_line"/>
 
+            <TextView
+                android:id="@+id/tv_ask_questions"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="@dimen/size_10"
+                android:paddingBottom="@dimen/size_10"
+                android:gravity="center_horizontal"
+                android:layout_gravity="center_horizontal"
+                android:textSize="@dimen/text_16"
+                android:textColor="@color/textGray"
+                android:text="去提问"/>
 
+        </LinearLayout>
+    </FrameLayout>
 </LinearLayout>

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

@@ -21,6 +21,8 @@ import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.util.TimeManager;
 import com.ruiwenliu.wrapper.util.ViewHolder;
 import com.ruiwenliu.wrapper.weight.TitleView;
+import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout;
+import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshView;
 import com.rv.component.utils.DateUtils;
 import com.rv.home.R;
 import com.rv.home.R2;
@@ -51,7 +53,7 @@ import butterknife.OnClick;
  * Date: 2019/5/16.
  * Desc:租车列表
  */
-public class CarRentalListActivity extends BaseStatusActivity<CommonPresenter> implements BaseQuickAdapter.RequestLoadMoreListener {
+public class CarRentalListActivity extends BaseStatusActivity<CommonPresenter> implements BaseQuickAdapter.RequestLoadMoreListener, SimpleRefreshLayout.OnSimpleRefreshListener{
     @BindView(R2.id.recyclerView)
     RecyclerView recyclerView;
     @BindView(R2.id.ll_head_menu)
@@ -64,6 +66,8 @@ public class CarRentalListActivity extends BaseStatusActivity<CommonPresenter> i
     TextView tvGetAddress;
     @BindView(R2.id.tv_out_address)
     TextView tvOutAddress;
+    @BindView(R2.id.refresh)
+    SimpleRefreshLayout mSimpleRefreshLayout;
 
     public CarRentalListAdapter mAdapter;
     private int countPage;
@@ -103,6 +107,8 @@ public class CarRentalListActivity extends BaseStatusActivity<CommonPresenter> i
     @Override
     protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
         titleView.setTitle(mActivity.getString(R.string.rv_select_car));
+        mSimpleRefreshLayout.setHeaderView(new SimpleRefreshView(mActivity));
+        mSimpleRefreshLayout.setOnSimpleRefreshListener(this);
         begDate = intent.getStringExtra("startTime");
         endDate = intent.getStringExtra("endTime");
         dataBean = (OrderDataBean) intent.getSerializableExtra("bean");
@@ -152,6 +158,7 @@ public class CarRentalListActivity extends BaseStatusActivity<CommonPresenter> i
 
     @Override
     public void onShowResult(int requestType, BaseBean result) {
+        mSimpleRefreshLayout.onRefreshComplete();
         switch (requestType) {
             case 0:
                 initData((CarAttributeListBean) result);
@@ -446,9 +453,7 @@ public class CarRentalListActivity extends BaseStatusActivity<CommonPresenter> i
     }
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        // TODO: add setContentView(...) invocation
-        ButterKnife.bind(this);
+    public void onRefresh() {
+        onFresh();
     }
 }

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

@@ -111,11 +111,22 @@ public class DrivingUploadActivity extends BaseStatusActivity<PickerPresenter> {
                     showToast(mActivity.getString(R.string.rv_phone_hint));
                     return;
                 }
+
+                if (getDrivingPhone().length() != 11){
+                    showToast("请输入正确手机号");
+                    return;
+                }
+
                 if (TextUtils.isEmpty(getDrivingIdCard())) {
                     showToast(mActivity.getString(R.string.rv_id_card_hint));
                     return;
                 }
 
+                if (getDrivingIdCard().length() != 18){
+                    showToast("请输入正确身份证号");
+                    return;
+                }
+
                 if (TextUtils.isEmpty(strCard)) {
                     showToast(mActivity.getString(R.string.rv_upload_driving_toast));
                     return;

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

@@ -12,7 +12,6 @@ import android.support.annotation.Nullable;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
-import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -34,7 +33,6 @@ import com.baidu.mapapi.search.geocode.GeoCodeResult;
 import com.baidu.mapapi.search.geocode.GeoCoder;
 import com.baidu.mapapi.search.geocode.OnGetGeoCoderResultListener;
 import com.baidu.mapapi.search.geocode.ReverseGeoCodeResult;
-import com.base.utils.ui.datetime.selector.util.DateUtil;
 import com.base.utils.ui.datetime.selector.util.TextUtil;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.frame.base.url.Constance;
@@ -43,7 +41,6 @@ import com.google.gson.Gson;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseFragment;
 import com.ruiwenliu.wrapper.util.LocationManager;
-import com.ruiwenliu.wrapper.util.TimeManager;
 import com.ruiwenliu.wrapper.util.UtilsManager;
 import com.ruiwenliu.wrapper.util.glide.GlideManager;
 import com.ruiwenliu.wrapper.util.listener.SwitchFragment;
@@ -68,11 +65,11 @@ import com.rv.home.rv.module.ui.main.home.bean.HomePopularBrigade;
 import com.rv.home.rv.module.ui.main.home.bean.ListsBean;
 import com.rv.home.rv.module.ui.main.home.bean.OrderDataBean;
 import com.rv.home.rv.module.ui.main.home.bean.ShopListBean;
-import com.rv.plugin.calendar.CalendarActivity;
 import com.yuyife.banner.Banner;
 import com.yuyife.banner.BannerConfig;
 import com.yuyife.banner.listener.OnBannerListener;
 import com.yuyife.banner.loader.ImageLoader;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -182,6 +179,10 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
     TextView tvHotEntertainmentHint;
     @BindView(R2.id.tv_hot_car_rental_hint)
     TextView tvHotCarRentalHint;
+    @BindView(R2.id.iv_travel_city_text_hint)
+    ImageView ivTravelCityTextHint;
+    @BindView(R2.id.iv_search_input_hint)
+    ImageView ivSearchInputHint;
 
 
     private ArrayList<String> images = new ArrayList<>();    //图片(默认采用网络地址)
@@ -903,7 +904,7 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
      * @param bean
      */
     private void processData(ShopListBean bean) {
-        if (bean.getData()!=null && bean.getData().getTotalCount() > 0) {
+        if (bean.getData() != null && bean.getData().getTotalCount() > 0) {
             if (headTvGetShop != null) {
                 headTvGetShop.setText(bean.getData().getData().get(0).getName());
                 headTvGetShop.setTextColor(_mActivity.getResources().getColor(R.color.colorMain));
@@ -917,7 +918,7 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
                 outLatitude = bean.getData().getData().get(0).getLatitude();
                 outLongitude = bean.getData().getData().get(0).getLongitude();
             }
-        }else{
+        } else {
             headTvGetShop.setText("");
             latLatitude = 0;
             lonLongitude = 0;
@@ -1014,6 +1015,9 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
             llItemSearch.setBackground(getResources().getDrawable(R.drawable.shape_rv_textview_home_translucent));
             travelCityText.setTextColor(getResources().getColor(R.color.colorWrite));
             travelServerImage.setImageResource(R.drawable.rv_rentingcar_icon_service_white);
+            ivTravelCityTextHint.setImageResource(R.drawable.rv_common_icon_up_arrow2);
+            ivSearchInputHint.setImageResource(R.drawable.rv_common_icon_search2);
+            searchInput.setHintTextColor(getResources().getColor(R.color.colorWrite));
             if (y <= 3) {
                 llItemTitle.setBackgroundColor(Color.argb(0, 0, 0, 0));
             } else {
@@ -1024,6 +1028,9 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
             llItemSearch.setBackground(getResources().getDrawable(R.drawable.shape_rv_textview_home_search));
             travelServerImage.setImageResource(R.drawable.rentingcar_icon_service_orangeorange);
             travelCityText.setTextColor(getResources().getColor(R.color.colorMain));
+            ivTravelCityTextHint.setImageResource(R.drawable.rv_common_icon_up_arrow);
+            ivSearchInputHint.setImageResource(R.drawable.rv_common_icon_search);
+            searchInput.setHintTextColor(getResources().getColor(R.color.text_Gray));
             llItemTitle.setBackgroundColor(Color.argb(255, 255, 255, 255));
         }
     }
@@ -1119,7 +1126,7 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
                 latLatitude = location.getLatitude();
                 lonLongitude = location.getLongitude();
                 mLatLng = new LatLng(location.getLatitude(), location.getLongitude());
-                getCityId =0;
+                getCityId = 0;
                 outCityId = 0;
                 headTvGetCity.setText(location.getCity());
                 headTvOutCity.setText(location.getCity());

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

@@ -197,7 +197,6 @@ public class SelectLocationActivity extends BaseStatusActivity<CommonPresenter>
     }
 
 
-    ;
 
     /**
      * 初始化百度
@@ -285,6 +284,8 @@ public class SelectLocationActivity extends BaseStatusActivity<CommonPresenter>
                 getIntent().putExtra("type", locationType);
                 getIntent().putExtra("latitude", searchBean.getLatLng().latitude);
                 getIntent().putExtra("longitude", searchBean.getLatLng().longitude);
+                getIntent().putExtra("city",selectCity);
+                getIntent().putExtra("cityId",mCityId);
 
                 setResult(RESULT_OK, getIntent());
                 finish();

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

@@ -153,8 +153,6 @@ public class ShopShowActivity extends BaseStatusActivity<CommonPresenter> {
             if (selectBean != null) {
                 showPickerDialog(new LatLng(selectBean.getLatitude(), selectBean.getLongitude()), selectBean.getAddrDetail());
             }
-
-
         }
     }
 

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

@@ -6,7 +6,8 @@
     android:background="@color/colorLine"
     android:orientation="vertical">
 
-    <com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/refresh"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
@@ -905,7 +906,6 @@
                                     </LinearLayout>
                                 </RelativeLayout>
                             </LinearLayout>
-
                         </LinearLayout>
 
                         <LinearLayout
@@ -1105,12 +1105,12 @@
                 android:textSize="@dimen/_ui_text_size_h6" />
 
             <ImageView
+                android:id="@+id/iv_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/rv_common_icon_up_arrow2" />
         </LinearLayout>
 
-
         <LinearLayout
             android:id="@+id/ll_item_search"
             android:layout_width="0dp"
@@ -1123,11 +1123,12 @@
 
 
             <ImageView
+                android:id="@+id/iv_search_input_hint"
                 android:layout_width="15dp"
                 android:layout_height="15dp"
                 android:layout_marginLeft="@dimen/ui_dimen_margin_h1"
                 android:layout_marginRight="@dimen/ui_dimen_common_small"
-                android:src="@mipmap/rv_common_icon_search" />
+                android:src="@drawable/rv_common_icon_search2" />
 
             <TextView
                 android:id="@+id/search_input"
@@ -1140,7 +1141,7 @@
                 android:paddingLeft="@dimen/ui_dimen_common"
                 android:paddingRight="@dimen/ui_dimen_padding_h1"
                 android:textColor="@color/colorTextH1"
-                android:textColorHint="@color/colorTextH3"
+                android:textColorHint="@color/colorWrite"
                 android:textSize="@dimen/_ui_text_size_h7" />
         </LinearLayout>
 

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

@@ -171,9 +171,16 @@
         android:layout_height="@dimen/size_half"
         android:background="@color/colorLine" />
 
+    <com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout
+        android:id="@+id/refresh"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
     <android.support.v7.widget.RecyclerView
         android:id="@+id/recyclerView"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
+    </com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout>
+
 </LinearLayout>

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

 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
+    android:layout_height="wrap_content"
     android:background="@color/colorWrite"
     android:orientation="vertical"
     android:paddingLeft="@dimen/size_15"
     android:paddingTop="@dimen/size_15"
-    android:paddingRight="@dimen/size_15"
-    android:layout_height="wrap_content">
+    android:paddingRight="@dimen/size_15">
 
     <LinearLayout
         android:id="@+id/ll_driving"
-        android:orientation="horizontal"
         android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/size_15"
-        android:layout_height="wrap_content">
+        android:orientation="horizontal">
+
         <CheckBox
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
             android:id="@+id/cb_driving"
-            android:layout_gravity="center_vertical"
-            />
-        <TextView
-            android:layout_marginLeft="@dimen/size_15"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/textMain"
-            android:textSize="@dimen/text_16"
-            android:text=""
-            android:id="@+id/tv_name"
-            />
-       <RelativeLayout
-           android:layout_marginLeft="@dimen/size_15"
-           android:layout_weight="1"
-           android:layout_width="match_parent"
-           android:layout_height="wrap_content">
-           <TextView
-               android:textSize="@dimen/text_14"
-               android:textColor="@color/textGray"
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content"
-               android:id="@+id/tv_phone"
-               android:text=""
-               />
-           <TextView
-               android:layout_below="@id/tv_phone"
-               android:textSize="@dimen/text_14"
-               android:textColor="@color/textGray"
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content"
-               android:id="@+id/tv_id_card"
-               android:text=""
-               />
-       </RelativeLayout>
+            android:layout_gravity="center_vertical" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/size_15"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/tv_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text=""
+                    android:textColor="@color/textMain"
+                    android:textSize="@dimen/text_16" />
+
+                <TextView
+                    android:id="@+id/tv_phone"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text=""
+                    android:textColor="@color/textGray"
+                    android:textSize="@dimen/text_14" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="身份证号"
+                    android:textColor="@color/textMain"
+                    android:textSize="@dimen/text_16" />
+
+                <TextView
+                    android:id="@+id/tv_id_card"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/tv_phone"
+                    android:text=""
+                    android:textColor="@color/textGray"
+                    android:textSize="@dimen/text_14" />
+            </LinearLayout>
+        </LinearLayout>
+
         <View
-            android:layout_marginRight="@dimen/size_5"
-            android:layout_gravity="center_vertical"
             android:layout_width="@dimen/size_half"
             android:layout_height="@dimen/size_25"
-            android:background="@color/colorGray"
-            />
+            android:layout_gravity="center_vertical"
+            android:layout_marginRight="@dimen/size_5"
+            android:background="@color/colorGray" />
+
         <TextView
-            android:layout_below="@id/tv_phone"
-            android:textSize="@dimen/text_14"
-            android:textColor="@color/textGray"
+            android:id="@+id/tv_edit"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-           android:layout_gravity="center_vertical"
-            android:id="@+id/tv_edit"
+            android:layout_below="@id/tv_phone"
+            android:layout_gravity="center_vertical"
             android:text="@string/rv_edit"
-            />
+            android:textColor="@color/textGray"
+            android:textSize="@dimen/text_14" />
     </LinearLayout>
-    <include layout="@layout/common_line"/>
+
+    <include layout="@layout/common_line" />
 </LinearLayout>