1.修改支付弹框。

app/src/main/java/com/quansu/heifengwuliu/activity/AddressActivity.kt

@@ -5,6 +5,7 @@ import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.Fragment
 import androidx.viewpager.widget.ViewPager.OnPageChangeListener
+import com.quansu.heifengwuliu.R
 import com.quansu.heifengwuliu.adapter.FragAdapter
 import com.quansu.heifengwuliu.base.MBActivity
 import com.quansu.heifengwuliu.databinding.ActivityAddressBinding
@@ -66,8 +67,8 @@ class AddressActivity : MBActivity<BViewModel<BRepository>, ActivityAddressBindi
             override fun onPageScrollStateChanged(state: Int) {}
         })
 
-        binding.llOne.setOnClickListener(View.OnClickListener { view: View? -> binding.viewPager.setCurrentItem(0) })
-        binding.llTwo.setOnClickListener(View.OnClickListener { view: View? -> binding.viewPager.setCurrentItem(1) })
+        binding.butSingle.setOnClickListener(View.OnClickListener { view: View? -> binding.viewPager.setCurrentItem(0) })
+        binding.butMore.setOnClickListener(View.OnClickListener { view: View? -> binding.viewPager.setCurrentItem(1) })
 
 
         if (type == "2") {
@@ -80,17 +81,17 @@ class AddressActivity : MBActivity<BViewModel<BRepository>, ActivityAddressBindi
     private fun choseType(position: Int) {
         when (position) {
             0 -> {
-                binding.tvOne.setTextColor(Color.parseColor("#4B3200"))
-                binding.tvTwo.setTextColor(Color.parseColor("#5D5E5F"))
-                binding.lineOne.setVisibility(View.VISIBLE)
-                binding.lineTwo.setVisibility(View.INVISIBLE)
+                binding.butSingle.setTextColor(Color.parseColor("#FCA100"))
+                binding.butMore.setTextColor(Color.parseColor("#ffffff"))
+                binding.butSingle.setBackgroundResource(R.drawable.bg_chose_on)
+                binding.butMore.setBackgroundResource(R.drawable.bg_chose_off)
 
             }
             1 -> {
-                binding.tvTwo.setTextColor(Color.parseColor("#4B3200"))
-                binding.tvOne.setTextColor(Color.parseColor("#5D5E5F"))
-                binding.lineTwo.setVisibility(View.VISIBLE)
-                binding.lineOne.setVisibility(View.INVISIBLE)
+                binding.butSingle.setTextColor(Color.parseColor("#ffffff"))
+                binding.butMore.setTextColor(Color.parseColor("#FCA100"))
+                binding.butSingle.setBackgroundResource(R.drawable.bg_chose_right_off)
+                binding.butMore.setBackgroundResource(R.drawable.bg_chose_right_on)
 
             }
             else -> {

app/src/main/java/com/quansu/heifengwuliu/activity/AllCarActivity.kt

@@ -15,12 +15,12 @@ class AllCarActivity : MBRActivity<CollectionVModel, CollectionAdapter, Activity
 
     override fun initView(view: View?) {
         super.initView(view)
-        binding.butSure.text = "确定"
+        binding.tvSure.text = "确定"
     }
 
     override fun listeners() {
         super.listeners()
-        binding.butSure.setOnClickListener {
+        binding.flSure.setOnClickListener {
             val list = adapter().data as ArrayList<DriverBean>
             if (list.size > 0) {
                 val choseList = ArrayList<SaveDriverBean>()

app/src/main/java/com/quansu/heifengwuliu/activity/CollectionActivity.kt

@@ -58,7 +58,7 @@ class CollectionActivity : MBRActivity<CollectionVModel, CollectionAdapter, Acti
 
     override fun listeners() {
         super.listeners()
-        binding.butSure.setOnClickListener {
+        binding.flSure.setOnClickListener {
 
             UiSwitch.singleRes(this, AllCarActivity::class.java,
                     MIntentAction.REQUEST_CODE_ONE)

app/src/main/java/com/quansu/heifengwuliu/fragment/AddressFragment.kt

@@ -54,7 +54,7 @@ class AddressFragment : MBRFragment<AddressVModel, AddressAdapter, FragmentAddre
     override fun listeners() {
         super.listeners()
 
-        binding.tvAdd.setOnClickListener {
+        binding.flAdd.setOnClickListener {
             //添加地址
             UiSwitch.bundleRes(this, AddressAddActivity::class.java,
                     B.with().putString("type", type).ok(), MIntentAction.REQUEST_CODE_ONE)

app/src/main/java/com/quansu/heifengwuliu/vmodel/SourceDetailsVModel.kt

@@ -11,7 +11,9 @@ import android.text.TextUtils
 import android.util.Log
 import android.view.LayoutInflater
 import android.widget.FrameLayout
+import android.widget.ImageView
 import android.widget.LinearLayout
+import android.widget.TextView
 import androidx.databinding.Bindable
 import androidx.lifecycle.MutableLiveData
 import com.google.gson.Gson
@@ -126,24 +128,24 @@ open class SourceDetailsVModel : BViewModel<BRepository>() {
         var mNormalPopup = QMUIPopups.fullScreenPopup(repository().context)
         val builder: QMUISkinValueBuilder = QMUISkinValueBuilder.acquire()
         val frameLayout = QMUIFrameLayout(repository().context)
-        frameLayout.background = QMUIResHelper.getAttrDrawable(repository().context, R.attr.qmui_skin_support_popup_bg)
-        builder.background(R.attr.qmui_skin_support_popup_bg)
-        QMUISkinHelper.setSkinValue(frameLayout, builder)
-        frameLayout.radius = QMUIDisplayHelper.dp2px(repository().context, 12)
-        val padding = QMUIDisplayHelper.dp2px(repository().context, 10)
-        frameLayout.setPadding(padding, padding, padding, padding)
 
         //自定义布局
         val layoutInflater = repository().context?.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
         var layout = layoutInflater.inflate(R.layout.item_apy, null)
-        val butCancel: QMUIRoundButton = layout.findViewById(R.id.but_cancel)
-        val butSure: QMUIRoundButton = layout.findViewById(R.id.tv_sure)
+        val butCancel: ImageView = layout.findViewById(R.id.iv_close)
+        val tvMoney: TextView = layout.findViewById(R.id.tv_money)
+        tvMoney.text="￥"+info.value!!.order.total
+
         val payPwdEditText: PasswordView = layout.findViewById(R.id.ppet)
         var password=""
 
         payPwdEditText.setPasswordListener(object : PasswordView.PasswordListener {
             override fun keyEnterPress(pwd: String?, isComplete: Boolean) {
                 password= pwd!!
+                if(!TextUtils.isEmpty(password)&&password.length==6){
+                    getInfoPay(info_id,password)
+                    mNormalPopup.dismiss()
+                }
 
             }
             override fun passwordChange(changeText: String?) {
@@ -151,29 +153,24 @@ open class SourceDetailsVModel : BViewModel<BRepository>() {
 
             override fun passwordComplete(pwd: String?) {
                 password=pwd!!
+                if(!TextUtils.isEmpty(password)&&password.length==6){
+                    getInfoPay(info_id,password)
+                    mNormalPopup.dismiss()
+                }
             }
 
         })
 
-        butSure.setOnClickListener {
-
-            if(TextUtils.isEmpty(password)){
-                toast("请输入支付密码！")
-                return@setOnClickListener
-            }
-            getInfoPay(info_id,password)
-
-            mNormalPopup.dismiss()
-        }
 
         butCancel.setOnClickListener {
             mNormalPopup.dismiss()
         }
         builder.release();
 
-        val size = QMUIDisplayHelper.dp2px(repository().context, 220)
+        val size= QMUIDisplayHelper.getScreenWidth(repository().context)
 
-        val lp: FrameLayout.LayoutParams = FrameLayout.LayoutParams(size, size)
+        val lp: FrameLayout.LayoutParams = FrameLayout.LayoutParams(size,
+                FrameLayout.LayoutParams.WRAP_CONTENT)
         frameLayout.addView(layout, lp)
 
         mNormalPopup.addView(frameLayout)

app/src/main/res/layout/activity_address.xml

@@ -8,97 +8,65 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:orientation="vertical"
+        android:background="@color/color_bg"
         android:layout_height="match_parent">
 
 
-        <LinearLayout
+        <FrameLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="14dp"
-            android:layout_marginRight="50dp"
-            android:gravity="center_vertical"
+            android:background="#FFBC00"
             android:orientation="horizontal"
-
-            >
+            android:layout_height="70dp">
+            
+            
             <ImageView
                 android:id="@+id/img_back"
-                android:layout_width="@dimen/title_bar_height"
-                android:layout_height="@dimen/title_bar_height"
-                android:layout_centerVertical="true"
-                android:src="@drawable/ic_back_black"
-                android:padding="16dp" />
+                android:layout_width="20dp"
+                android:src="@drawable/ic_back_white"
+                android:layout_marginTop="31dp"
+                android:layout_marginStart="15dp"
+                android:layout_height="20dp"/>
 
             <LinearLayout
-                android:id="@+id/ll_one"
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/tv_one"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="发货地址"
-                    android:textColor="#4B3200"
-                    android:textSize="16sp"></TextView>
-
-                <View
-                    android:id="@+id/line_one"
-                    android:layout_width="30dp"
-                    android:layout_height="1dp"
-                    android:layout_marginTop="2dp"
-                    android:background="#4B3200">
+                android:layout_gravity="center|bottom"
+                android:layout_marginBottom="18dp"
+                android:orientation="horizontal">
 
-                </View>
 
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/ll_two"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/tv_two"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                <Button
+                    android:id="@+id/but_single"
+                    android:layout_width="80dp"
+                    android:layout_height="30dp"
+                    android:background="@drawable/bg_chose_on"
+                    android:text="发货地址"
+                    android:textSize="14sp"
+                    android:textColor="#FCA100"></Button>
+
+                <Button
+                    android:id="@+id/but_more"
+                    android:layout_width="80dp"
+                    android:layout_height="30dp"
+                    android:background="@drawable/bg_chose_off"
                     android:text="卸货地址"
-                    android:textColor="#5D5E5F"
-                    android:textSize="16sp"></TextView>
-
-                <View
-                    android:id="@+id/line_two"
-                    android:layout_width="30dp"
-                    android:layout_height="1dp"
-                    android:layout_marginTop="2dp"
-                    android:background="#4B3200"
-                    android:visibility="invisible">
-
-                </View>
+                    android:textSize="14sp"
+                    android:textColor="#ffffff"></Button>
 
 
             </LinearLayout>
 
-
-
-        </LinearLayout>
+        </FrameLayout>
 
         <androidx.viewpager.widget.ViewPager
             android:id="@+id/view_pager"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginTop="22dp">
+            >
 
         </androidx.viewpager.widget.ViewPager>
 
 
 
-
     </LinearLayout>
 </layout >

app/src/main/res/layout/activity_addressadd.xml

@@ -11,12 +11,13 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:orientation="vertical"
+        android:background="@color/color_bg"
         android:layout_height="match_parent">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
+            android:layout_marginTop="13dp"
             android:background="@color/white"
             android:orientation="vertical"
             android:paddingStart="15dp"
@@ -35,8 +36,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="联系人"
-                    android:textColor="#000000"
-                    android:textSize="16sp"></TextView>
+                    android:textColor="#26292F"
+                    android:textSize="14sp"></TextView>
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -51,6 +52,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="36dp"
                     android:layout_marginStart="21dp"
+                    android:gravity="right|center"
                     android:background="@null"
                     android:hint="@string/please_input_user_name"
                     android:text="@={vm.name}"
@@ -61,7 +63,7 @@
 
             <View
                 android:layout_width="match_parent"
-                android:background="#BBBBBB"
+                android:background="#EEEFF0"
                 android:layout_marginTop="@dimen/dp_10"
                 android:layout_marginBottom="@dimen/dp_10"
                 android:layout_height="@dimen/dp_1">
@@ -78,8 +80,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="手机号码"
-                    android:textColor="#000000"
-                    android:textSize="16sp">
+                    android:textColor="#26292F"
+                    android:textSize="14sp">
 
                 </TextView>
                 <TextView
@@ -97,6 +99,8 @@
                     android:layout_marginStart="21dp"
                     android:background="@null"
                     android:hint="@string/please_input_user_phone"
+                    android:gravity="right|center"
+
                     android:text="@={vm.phone}"
                     android:textSize="@dimen/sp_15" />
 
@@ -107,7 +111,7 @@
 
             <View
                 android:layout_width="match_parent"
-                android:background="#BBBBBB"
+                android:background="#EEEFF0"
                 android:layout_marginTop="@dimen/dp_10"
                 android:layout_marginBottom="@dimen/dp_10"
                 android:layout_height="@dimen/dp_1">
@@ -126,8 +130,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="选择地区"
-                    android:textColor="#000000"
-                    android:textSize="16sp">
+                    android:textColor="#26292F"
+                    android:textSize="14sp">
 
                 </TextView>
 
@@ -163,7 +167,7 @@
 
             <View
                 android:layout_width="match_parent"
-                android:background="#BBBBBB"
+                android:background="#EEEFF0"
                 android:layout_marginTop="@dimen/dp_10"
                 android:layout_marginBottom="@dimen/dp_10"
                 android:layout_height="@dimen/dp_1">
@@ -186,8 +190,8 @@
                         android:layout_weight="1"
                         android:layout_height="wrap_content"
                         android:text="详细地址"
-                        android:textColor="#000000"
-                        android:textSize="16sp">
+                        android:textColor="#26292F"
+                        android:textSize="14sp">
 
                     </TextView>
 
@@ -227,7 +231,6 @@
                     android:gravity="center_vertical"
                     android:hint="街道门牌信息"
                     android:text="@{vm.address}"
-                    android:paddingStart="11dp"
                     android:textColor="#2F2F31"
                     android:textColorHint="#929390"
                     android:layout_marginTop="10dp"
@@ -241,7 +244,7 @@
 
             <View
                 android:layout_width="match_parent"
-                android:background="#BBBBBB"
+                android:background="#EEEFF0"
                 android:layout_marginTop="@dimen/dp_10"
                 android:layout_marginBottom="@dimen/dp_10"
                 android:layout_height="@dimen/dp_1">
@@ -257,8 +260,8 @@
                     android:layout_weight="1"
                     android:layout_height="wrap_content"
                     android:text="设为默认"
-                    android:textColor="#000000"
-                    android:textSize="16sp">
+                    android:textColor="#26292F"
+                    android:textSize="14sp">
                 </TextView>
 
                 <ImageView
@@ -274,39 +277,29 @@
             </LinearLayout>
 
 
-            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
-                android:id="@+id/ll_save"
+            <FrameLayout
                 android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:layout_marginStart="10dp"
-                android:layout_marginBottom="20dp"
-                android:layout_marginTop="@dimen/dp_40"
-                android:layout_marginEnd="10dp"
+                android:layout_marginStart="16dp"
                 android:onClick="@{v->vm.setSave()}"
-                android:orientation="horizontal"
-                android:gravity="center"
-                app:qmui_backgroundColor="#5D76F4"
-                app:qmui_borderColor="#5D76F4"
-                app:qmui_radius="@dimen/dp_4"
-                app:qmui_shadowAlpha="0.56"
-                app:qmui_shadowElevation="7dp">
-
+                android:layout_marginEnd="@dimen/dp_16"
+                android:layout_marginTop="25dp"
+                android:layout_height="wrap_content">
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="106dp"
+                    android:src="@drawable/ic_details_grab" />
 
                 <TextView
                     android:layout_width="wrap_content"
-                    android:textSize="@dimen/sp_16"
-                    android:textColor="@color/white"
+                    android:layout_gravity="center"
                     android:text="添加"
+                    android:textColor="@color/white"
+                    android:textSize="16sp"
                     android:layout_height="wrap_content">
 
                 </TextView>
 
-
-            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
-
-
-
-
+            </FrameLayout>
 
 
 

app/src/main/res/layout/activity_collection.xml

@@ -14,6 +14,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:background="@color/color_bg"
         android:orientation="vertical" >
 
         <com.quansu.heifengwuliu.widget.SearchView
@@ -35,21 +36,42 @@
                     android:id="@+id/recycler_view"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:paddingBottom="70dp"
+                    android:paddingBottom="106dp"
                     app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                     tools:listitem="@layout/item_collection" />
 
             </androidx.swiperefreshlayout.widget.SwipeRefreshLayout >
 
-            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-                android:id="@+id/but_sure"
+
+
+
+            <FrameLayout
+                android:id="@+id/fl_sure"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_40"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="@dimen/dp_16"
                 android:layout_gravity="bottom"
-                android:layout_marginStart="@dimen/dp_30"
-                android:layout_marginEnd="@dimen/dp_30"
-                android:layout_marginBottom="@dimen/dp_30"
-                android:text="@string/add_vehicle" />
+                android:layout_height="wrap_content">
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="106dp"
+                    android:src="@drawable/ic_details_grab" />
+
+                <TextView
+                    android:id="@+id/tv_sure"
+                    android:layout_width="wrap_content"
+                    android:layout_gravity="center"
+                    android:text="添加车辆"
+                    android:textColor="@color/white"
+                    android:textSize="16sp"
+                    android:layout_height="wrap_content">
+
+                </TextView>
+
+            </FrameLayout>
+
+
+
 
         </FrameLayout >
 

app/src/main/res/layout/activity_sourcedetails.xml

@@ -619,6 +619,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="@dimen/dp_10"
                     android:orientation="horizontal"
+                    android:layout_marginTop="10dp"
                     android:visibility="@{vm.type==2?View.GONE:View.VISIBLE}">
 
 
@@ -629,10 +630,12 @@
                         android:layout_marginStart="@dimen/dp_10"
                         android:onClick="@{v->vm.setCancelOrder(vm.info.order.info_id)}"
                         android:text="取消发布"
-                        android:textColor="@color/text_title"
+                        android:textColor="@color/white"
+                        android:textSize="16sp"
                         android:visibility="@{vm.isShowCancelBut(vm.info.order.info_state)?View.VISIBLE:View.GONE}"
-                        app:qmui_borderColor="@color/color_line"
-                        app:qmui_radius="@dimen/dp_4">
+                        app:qmui_borderColor="#FF6029"
+                        app:qmui_backgroundColor="#FF6029"
+                        app:qmui_radius="25dp">
 
                     </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton>
 
@@ -643,10 +646,12 @@
                         android:layout_marginStart="@dimen/dp_15"
                         android:onClick="@{v->vm.anotherOne()}"
                         android:text="再来一单"
-                        android:textColor="@color/text_title"
+                        android:textSize="16dp"
+                        android:textColor="@color/white"
                         android:visibility="@{vm.type==1?View.VISIBLE:View.GONE}"
-                        app:qmui_borderColor="@color/color_line"
-                        app:qmui_radius="@dimen/dp_4">
+                        app:qmui_borderColor="#F3B23E"
+                        app:qmui_backgroundColor="#F3B23E"
+                        app:qmui_radius="25dp">
 
                     </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton>
 
@@ -657,10 +662,12 @@
                         android:layout_marginStart="@dimen/dp_15"
                         android:onClick="@{v->vm.goDriverList()}"
                         android:text="接单车辆"
-                        android:textColor="@color/text_title"
+                        android:textColor="@color/white"
                         android:visibility="@{vm.isShowReceiveVehicle(vm.info.order.info_state)?View.VISIBLE:View.GONE}"
-                        app:qmui_borderColor="@color/color_line"
-                        app:qmui_radius="@dimen/dp_4">
+                        app:qmui_borderColor="#F3AC3C"
+                        app:qmui_backgroundColor="#F3AC3C"
+                        android:textSize="16sp"
+                        app:qmui_radius="25dp">
 
                     </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton>
 
@@ -672,10 +679,12 @@
                         android:layout_marginStart="@dimen/dp_15"
                         android:onClick="@{v->vm.goTrack()}"
                         android:text="运输轨迹"
-                        android:textColor="@color/text_title"
+                        android:textColor="@color/white"
                         android:visibility="@{vm.type==0?View.VISIBLE:View.GONE}"
-                        app:qmui_borderColor="@color/color_line"
-                        app:qmui_radius="@dimen/dp_4">
+                        app:qmui_borderColor="#F2AB3C"
+                        app:qmui_backgroundColor="#F2AB3C"
+                        android:textSize="16sp"
+                        app:qmui_radius="25dp">
 
                     </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton>
 
@@ -687,10 +696,12 @@
                         android:layout_marginStart="@dimen/dp_15"
                         android:onClick="@{v->vm.goStep()}"
                         android:text="下一步"
-                        android:textColor="@color/text_title"
+                        android:textSize="16sp"
+                        android:textColor="@color/white"
                         android:visibility="@{vm.type==0?View.VISIBLE:View.GONE}"
-                        app:qmui_borderColor="@color/color_line"
-                        app:qmui_radius="@dimen/dp_4">
+                        app:qmui_borderColor="#F2AB3C"
+                        app:qmui_backgroundColor="#F2AB3C"
+                        app:qmui_radius="25dp">
 
                     </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton>
 
@@ -704,6 +715,7 @@
                 android:layout_height="match_parent"
                 android:background="#80000000"
                 android:gravity="center"
+                tools:visibility="gone"
                 android:visibility="@{vm.isDialogShow?View.VISIBLE:View.GONE}"
                 android:onClick="@{v->vm.interceptClick()}"
                 android:orientation="vertical">

app/src/main/res/layout/fragment_address.xml

@@ -14,6 +14,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:background="@color/color_bg"
         android:orientation="vertical" >
 
         <com.quansu.heifengwuliu.widget.SearchView
@@ -38,6 +39,7 @@
                     android:id="@+id/recycler_view"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
+                    android:paddingBottom="106dp"
                     app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                     tools:listitem="@layout/item_address" />
 
@@ -72,17 +74,34 @@
 
         </FrameLayout >
 
-        <TextView
-            android:id="@+id/tv_add"
+
+
+
+        <FrameLayout
+            android:id="@+id/fl_add"
             android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:background="#5D76F4"
-            android:gravity="center"
-            android:text="添加新地址"
-            android:textColor="@color/white"
-            android:textSize="@dimen/sp_16" >
-
-        </TextView >
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="@dimen/dp_16"
+            android:layout_height="wrap_content">
+            <ImageView
+                android:layout_width="match_parent"
+                android:layout_height="106dp"
+                android:src="@drawable/ic_details_grab" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_gravity="center"
+                android:text="添加新地址"
+                android:textColor="@color/white"
+                android:textSize="16sp"
+                android:layout_height="wrap_content">
+
+            </TextView>
+
+        </FrameLayout>
+
+
+
 
     </LinearLayout >
 

app/src/main/res/layout/item_address.xml

@@ -20,15 +20,15 @@
         android:id="@+id/rl_todo"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_10"
-        android:layout_marginEnd="@dimen/dp_10"
-        android:layout_marginBottom="@dimen/dp_10"
+        android:layout_marginStart="17dp"
+        android:layout_marginEnd="28dp"
+        android:layout_marginTop="12dp"
         android:orientation="horizontal"
-        android:paddingLeft="@dimen/dp_10"
-        app:qmui_borderColor="#BBBBBB"
+        android:paddingLeft="11dp"
         android:gravity="center_vertical"
-        app:qmui_borderWidth="@dimen/dp_1"
-        app:qmui_radius="@dimen/dp_2">
+        app:qmui_borderColor="@color/white"
+        app:qmui_backgroundColor="@color/white"
+        app:qmui_radius="6dp">
 
 
         <ImageView
@@ -62,8 +62,8 @@
                     android:layout_height="wrap_content"
                     android:text="@{item.name}"
                     android:layout_marginTop="@dimen/dp_10"
-                    android:textColor="#343434"
-                    android:textSize="@dimen/sp_16"
+                    android:textColor="#1C1C1C"
+                    android:textSize="15sp"
                     tools:text="@string/app_name" />
 
                 <TextView
@@ -71,11 +71,11 @@
                     android:layout_width="0dp"
                     android:layout_weight="1"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/dp_10"
+                    android:layout_marginStart="12dp"
                     android:text="@{item.mobile}"
                     android:layout_marginTop="@dimen/dp_10"
-                    android:textColor="#343434"
-                    android:textSize="@dimen/sp_16"
+                    android:textColor="#949494"
+                    android:textSize="12sp"
                     tools:text="18353075657" />
 
 
@@ -87,8 +87,9 @@
                     android:paddingEnd="@dimen/dp_10"
                     android:paddingBottom="@dimen/dp_2"
                     android:paddingTop="@dimen/dp_2"
-                    android:background="#459AEA"
+                    android:background="#F5BF41"
                     android:textColor="@color/white"
+                    android:textSize="14sp"
                     android:layout_height="wrap_content">
 
                 </TextView>
@@ -99,14 +100,14 @@
 
             <TextView
                 android:id="@+id/tv_address"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_10"
+                android:layout_marginTop="3dp"
                 android:layout_marginBottom="@dimen/dp_10"
                 android:text="@{item.address}"
                 android:textColor="#343434"
                 android:layout_marginRight="@dimen/dp_10"
-                android:textSize="@dimen/sp_16"
+                android:textSize="@dimen/sp_13"
                 tools:text="山东省临沂市河东区芝麻墩街道金华路XX号" />
 
         </LinearLayout>

app/src/main/res/layout/item_apy.xml

@@ -1,92 +1,86 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_height="wrap_content">
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical">
 
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:padding="@dimen/dp_10"
+        android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:gravity="center"
-        android:layout_height="wrap_content">
-
-
-        <TextView
-            android:id="@+id/tv_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:textColor="#333333"
-            android:text="输入支付密码"/>
-
-        <com.quansu.heifengwuliu.view.PasswordView
-            android:id="@+id/ppet"
-            android:layout_below="@+id/tv_title"
-            android:layout_width="match_parent"
-            app:cipherEnable="true"
-            android:layout_marginTop="30dp"
-            android:layout_centerInParent="true"
-            app:passwordLength="6"
-            app:smode="rect"
-            android:layout_height="45dp">
-
-        </com.quansu.heifengwuliu.view.PasswordView>
-
-
-
-
-
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_weight="1"
-            android:layout_height="0dp"></View>
-        <LinearLayout
+        android:padding="@dimen/dp_10">
+        
+        <ImageView
+            android:id="@+id/iv_close"
+            android:layout_width="26dp"
+            android:src="@drawable/ic_dialog_close"
+            android:layout_gravity="right"
+            android:layout_marginEnd="27dp"
+            android:layout_height="26dp"/>
+
+
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
             android:layout_width="match_parent"
-            android:layout_marginBottom="@dimen/dp_10"
-            android:orientation="horizontal"
-            android:paddingStart="@dimen/dp_20"
-            android:paddingEnd="@dimen/dp_20"
-            android:layout_height="wrap_content">
-
-
-            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-                android:id="@+id/but_cancel"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_marginEnd="@dimen/dp_20"
-                app:qmui_radius="@dimen/dp_4"
-                android:text="取消"
-                app:qmui_borderColor="@color/blue_1"
-                android:textColor="@color/blue_1"
-                android:layout_height="40dp">
-
-            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton>
-
-            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-                android:id="@+id/tv_sure"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:text="确定"
-                android:textColor="@color/white"
-                app:qmui_radius="@dimen/dp_4"
-                app:qmui_backgroundColor="@color/blue_1"
-                app:qmui_borderColor="@color/blue_1"
-                android:layout_height="40dp">
-
-            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton>
-
-
-
-        </LinearLayout>
+            android:layout_height="270dp"
+            android:layout_marginStart="27dp"
+            android:layout_marginEnd="27dp"
+            android:layout_marginTop="12dp"
+            app:qmui_radius="8dp"
+            android:gravity="center_horizontal"
+            app:qmui_backgroundColor="@color/white"
+            app:qmui_borderColor="@color/white"
+            android:orientation="vertical">
+
+
+            <TextView
+                android:id="@+id/tv_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="46dp"
+                android:textSize="18sp"
+                android:textStyle="bold"
+                android:text="输入支付密码"
+                android:textColor="#000000" />
+
+
+            <TextView
+                android:id="@+id/tv_money"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="20dp"
+                android:textSize="40sp"
+                android:textStyle="bold"
+                tools:text="¥80000.00"
+                android:textColor="#000000" />
+
+            <com.quansu.heifengwuliu.view.PasswordView
+                android:id="@+id/ppet"
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:layout_below="@+id/tv_title"
+                android:layout_centerInParent="true"
+                android:layout_marginStart="25dp"
+                android:layout_marginEnd="25dp"
+                android:layout_marginTop="32dp"
+                app:cipherEnable="true"
+                app:passwordLength="6"
+                app:borderColor="#979797"
+                app:smode="underline">
+
+            </com.quansu.heifengwuliu.view.PasswordView>
+
+
+
+
+        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
 
     </LinearLayout>
 
 
-
-
 </LinearLayout>

app/src/main/res/layout/item_collection.xml

@@ -1,109 +1,112 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" >
+    xmlns:tools="http://schemas.android.com/tools">
 
-    <data >
+    <data>
 
         <variable
             name="item"
             type="com.quansu.heifengwuliu.model.DriverBean" />
 
-    </data >
+    </data>
+
+
+    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout xmlns:app="http://schemas.android.com/apk/res-auto"
 
-    <RelativeLayout
-        android:id="@+id/rl_todo"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:paddingLeft="@dimen/dp_10"
-        android:background="#ffffff"
-        android:paddingTop="@dimen/dp_20"
-        android:paddingBottom="@dimen/dp_20"
-        android:layout_marginBottom="@dimen/dp_10"
-        android:paddingRight="@dimen/dp_10" >
-
-
-        <ImageView
-            android:id="@+id/img_check"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:padding="10dp"
-            android:layout_centerVertical="true"
-            android:src="@{item.checked==0?@drawable/select_off:@drawable/select_on}"
-            >
-
-        </ImageView>
-
-<!--        <ImageView-->
-<!--            android:id="@+id/img_check"-->
-<!--            android:layout_width="15dp"-->
-<!--            android:layout_height="15dp"-->
-<!--            android:layout_centerVertical="true"-->
-<!--            android:src="@{item.checked==0?@drawable/select_off:@drawable/select_on}"-->
-<!--             />-->
-
-        <ImageView
-            android:id="@+id/img_icon"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
-            android:layout_centerVertical="true"
-            android:layout_toEndOf="@id/img_check"
-            android:padding="@dimen/dp_13"
-            android:background="@mipmap/ic_launcher"
-            app:url="@{item.avatar}"
-             />
-
-        <LinearLayout
+        android:layout_marginStart="17dp"
+        android:layout_marginTop="12dp"
+        android:layout_marginEnd="16dp"
+        android:paddingStart="12dp"
+        android:paddingTop="21dp"
+        android:paddingEnd="12dp"
+        android:paddingBottom="21dp"
+        app:qmui_backgroundColor="@color/white"
+        app:qmui_borderColor="@color/white"
+        app:qmui_radius="4dp">
+
+        <RelativeLayout
+            android:id="@+id/rl_todo"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginStart="@dimen/dp_8"
-            android:layout_toEndOf="@id/img_icon"
-            android:orientation="vertical" >
+            android:layout_height="wrap_content">
+
+
+            <ImageView
+                android:id="@+id/img_check"
+                android:layout_width="37dp"
+                android:layout_height="37dp"
+                android:layout_centerVertical="true"
+                android:padding="10dp"
+                android:src="@{item.checked==0?@drawable/select_off:@drawable/select_on}">
+
+            </ImageView>
+
+
+
+            <ImageView
+                android:id="@+id/img_icon"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_centerVertical="true"
+                android:layout_toEndOf="@id/img_check"
+                android:layout_marginStart="2dp"
+                android:src="@drawable/bg_need_error"
+                app:url="@{item.avatar}" />
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal" >
+                android:layout_centerVertical="true"
+                android:layout_marginStart="@dimen/dp_8"
+                android:layout_toEndOf="@id/img_icon"
+                android:orientation="vertical">
 
-                <TextView
-                    android:id="@+id/tv_name"
-                    android:layout_width="wrap_content"
+                <LinearLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:ellipsize="end"
-                    android:maxLines="1"
-                    android:text="@{item.name}"
-                    android:textColor="@{item.checked==1?@color/text_hint:@color/text_black}"
-                    android:textSize="@dimen/sp_16"
-                    tools:text="@string/app_name" />
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:id="@+id/tv_name"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:ellipsize="end"
+                        android:maxLines="1"
+                        android:text="@{item.name}"
+                        android:textColor="#26292F"
+                        android:textStyle="bold"
+                        android:textSize="@dimen/sp_16"
+                        tools:text="@string/app_name" />
+
+                    <TextView
+                        android:id="@+id/tv_phone"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:ellipsize="end"
+                        android:maxLines="1"
+                        android:text="@{item.mobile}"
+                        android:textColor="#FFBC00"
+                        android:textSize="@dimen/sp_14"
+                        tools:text="@string/app_name" />
+
+                </LinearLayout>
 
                 <TextView
-                    android:id="@+id/tv_phone"
+                    android:id="@+id/tv_desc"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:ellipsize="end"
-                    android:maxLines="1"
-                    android:text="@{item.mobile}"
-                    android:textColor="@{item.checked==1?@color/text_hint:@color/text_black}"
-                    android:textSize="@dimen/sp_16"
+                    android:layout_marginTop="7dp"
+                    android:text="@{item.number+item.car_cate}"
+                    android:textColor="#767778"
+                    android:textSize="13sp"
                     tools:text="@string/app_name" />
 
-            </LinearLayout >
-
-            <TextView
-                android:id="@+id/tv_desc"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_2"
-                android:text="@{item.number+item.car_cate}"
-
-                android:textColor="@{item.checked==1?@color/text_hint:@color/text_black}"
-                tools:text="@string/app_name" />
+            </LinearLayout>
 
-        </LinearLayout >
 
+        </RelativeLayout>
+    </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
-    </RelativeLayout >
-</layout >
+</layout>