1.金额统计+明细列表。

app/src/main/AndroidManifest.xml

@@ -95,6 +95,7 @@
         <activity android:name=".activity.GrabDetailsActivity"/>
         <activity android:name=".activity.BankActivity"/>
         <activity android:name=".activity.VehicleInfoActivity"/>
+        <activity android:name=".activity.EvaluateActivity"/>
 
 
     </application >

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

@@ -0,0 +1,24 @@
+package com.quansu.heifengwuliu.activity
+
+import com.quansu.heifengwuliu.base.MBActivity
+import com.quansu.heifengwuliu.databinding.ActivityEvaluateBinding
+import com.quansu.heifengwuliu.vmodel.EvaluateVModel
+
+/**
+ *Created by shihuiyun
+ *on 2020/9/22
+ */
+class EvaluateActivity: MBActivity<EvaluateVModel, ActivityEvaluateBinding>(){
+
+    override fun binding(): ActivityEvaluateBinding {
+        return ActivityEvaluateBinding.inflate(layoutInflater)
+    }
+
+    override fun vmClass(): Class<EvaluateVModel> {
+        return EvaluateVModel::class.java
+    }
+
+    override fun title(): String? {
+        return "发表评价"
+    }
+}

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

@@ -9,7 +9,6 @@ import com.qmuiteam.qmui.kotlin.onClick
 import com.quansu.heifengwuliu.base.MBActivity
 import com.quansu.heifengwuliu.config.MIntentAction
 import com.quansu.heifengwuliu.databinding.ActivityVehicleInfoBinding
-import com.quansu.heifengwuliu.inte.ChoiceData
 import com.quansu.heifengwuliu.inte.ChoiceListData
 import com.quansu.heifengwuliu.inte.OnUploadCallback
 import com.quansu.heifengwuliu.model.SelectData

app/src/main/java/com/quansu/heifengwuliu/adapter/BillAdapter.kt

@@ -2,12 +2,12 @@ package com.quansu.heifengwuliu.adapter
 
 import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
 import com.quansu.heifengwuliu.R
-import com.quansu.heifengwuliu.databinding.ItemMsgBinding
-import com.quansu.heifengwuliu.model.Msg
+import com.quansu.heifengwuliu.databinding.ItemBillBinding
+import com.quansu.heifengwuliu.model.AmountList
 import com.ysnows.base.base.BAdapter
 
-class BillAdapter : BAdapter<Msg, BaseDataBindingHolder<ItemMsgBinding>>(R.layout.item_msg) {
-    override fun convert(holder: BaseDataBindingHolder<ItemMsgBinding>, item: Msg) {
+class BillAdapter : BAdapter<AmountList, BaseDataBindingHolder<ItemBillBinding>>(R.layout.item_bill) {
+    override fun convert(holder: BaseDataBindingHolder<ItemBillBinding>, item: AmountList) {
         holder.dataBinding?.item = item
     }
-}
+}

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

@@ -1,5 +1,6 @@
 package com.quansu.heifengwuliu.fragment
 
+import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import com.quansu.heifengwuliu.adapter.BillAdapter
@@ -9,6 +10,12 @@ import com.quansu.heifengwuliu.vmodel.AccountBillVModel
 
 class AccountBillFragment : MBRFragment<AccountBillVModel, BillAdapter, FragmentAccountBillBinding>() {
 
+
+    override fun init(savedInstanceState: Bundle?) {
+        super.init(savedInstanceState)
+        vm.getAmountCount()
+    }
+
     override fun initAdapter(): BillAdapter {
         return BillAdapter()
     }

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

@@ -3,8 +3,10 @@ package com.quansu.heifengwuliu.fragment
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
+import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import com.qmuiteam.qmui.kotlin.onClick
 import com.quansu.heifengwuliu.adapter.IndexAdapter
 import com.quansu.heifengwuliu.base.MBRFragment
 import com.quansu.heifengwuliu.config.MIntentAction
@@ -24,6 +26,16 @@ class IndexFragment :  MBRFragment<IndexVModel, IndexAdapter, FragmentIndexBindi
         vm.setFragment(this)
     }
 
+    override fun listeners() {
+        super.listeners()
+        binding.tvScreen.onClick {
+            binding.drawerLayout.openDrawer(binding.menuLayoutRight)
+        }
+        binding.flToSearch.onClick {
+            binding.drawerLayout.closeDrawers()
+        }
+    }
+
 
     override fun vmClass(): Class<IndexVModel> {
         return IndexVModel::class.java

app/src/main/java/com/quansu/heifengwuliu/model/AmountCount.kt

@@ -0,0 +1,10 @@
+package com.quansu.heifengwuliu.model
+
+import com.ysnows.base.inter.IModel
+
+/**
+ *Created by shihuiyun
+ *on 2020/9/22
+ */
+data class AmountCount(var money:String,var frozen:String,var can_use:String) : IModel {
+}

app/src/main/java/com/quansu/heifengwuliu/model/AmountList.kt

@@ -0,0 +1,16 @@
+package com.quansu.heifengwuliu.model
+
+import com.ysnows.base.inter.IModel
+
+/**
+ *Created by shihuiyun
+ *on 2020/9/22
+ * set：0 出（-）  1入（+）
+ */
+data class AmountList(var amount_id:String,var uid:String,var info_id:String,
+                      var set:Int,var money:String,var total:String,
+                      var type:Int,var pic:String,var data:String,
+                      var status:String,var create_time:String,var update_time:String,
+                      var delete_time:String
+): IModel {
+}

app/src/main/java/com/quansu/heifengwuliu/utils/net/ApiService.kt

@@ -458,6 +458,21 @@ interface ApiService {
     fun cvDriving(@Query("img") img: String?): Observable<Response<CvDriving>>
 
 
+    /**
+     * 金额统计-资金
+     * @return
+     */
+    @GET("api/amount/amountCount")
+    fun amountCount(): Observable<Response<AmountCount>>
+
+
+    /**
+     * 明细列表-资金
+     * @return
+     */
+    @GET("api/amount/amountList")
+    fun amountList( @Query("p") p: Int): Observable<Response<List<AmountList>>>
+
 
 
 

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

@@ -1,5 +1,8 @@
 package com.quansu.heifengwuliu.vmodel
 
+import androidx.lifecycle.MutableLiveData
+import com.quansu.heifengwuliu.model.AmountCount
+import com.quansu.heifengwuliu.model.User
 import com.quansu.heifengwuliu.utils.net.NetEngine
 import com.ysnows.base.base.BRRepository
 import com.ysnows.base.base.BRViewModel
@@ -12,7 +15,27 @@ import io.reactivex.Observable
  */
  class AccountBillVModel : BRViewModel<BRRepository>() {
 
+
+    val user: MutableLiveData<User?> = MutableLiveData(User.get())
+    var info:MutableLiveData<AmountCount> = MutableLiveData<AmountCount>()
+
+
     override fun api(): Observable<out IResponse<*>> {
-        return NetEngine.service.taskList("",  repository().autoPage())
+        return NetEngine.service.amountList(repository().autoPage())
+    }
+
+    fun getAmountCount(){
+
+        repository().lreq(NetEngine.service.amountCount())
+                .doOnNext {
+                    if (it.ok(false)) {
+                        var bean=it.data() as AmountCount
+                        if(null!=bean){
+                            info.value=bean
+                        }
+
+                    }
+                }
+                .subscribe()
     }
 }

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

@@ -101,7 +101,7 @@ class BankVModel : BViewModel<BRepository>() {
         //获取银行卡信息
         repository().lreq(NetEngine.service.getInfo("4"))
                 .doOnNext {
-                    if (it.ok(true)) {
+                    if (it.ok(false)) {
                         var bean=it.data() as InfoBean
                         if(null!=bean){
                             name=bean.name

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

@@ -0,0 +1,20 @@
+package com.quansu.heifengwuliu.vmodel
+
+import androidx.databinding.Bindable
+import com.quansu.heifengwuliu.BR
+import com.ysnows.base.base.BRepository
+import com.ysnows.base.base.BViewModel
+
+/**
+ *Created by shihuiyun
+ *on 2020/9/22
+ */
+class EvaluateVModel: BViewModel<BRepository>() {
+
+    @Bindable
+    var name: String? = null
+        set(value) {
+            field = value
+            notifyPropertyChanged(BR.name)
+        }
+}

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

@@ -87,7 +87,7 @@ class PersonalVerityVModel : BViewModel<PersonalVerifyRepository>() {
         //获取个人信息
         repository().lreq(NetEngine.service.getInfo("1"))
                 .doOnNext {
-                    if (it.ok(true)) {
+                    if (it.ok(false)) {
                         var bean=it.data()
                         if(null!=bean){
                             isShow.value = bean.status != "1"

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

@@ -28,6 +28,7 @@ import com.qmuiteam.qmui.widget.popup.QMUIPopups
 import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
 import com.quansu.heifengwuliu.BR
 import com.quansu.heifengwuliu.R
+import com.quansu.heifengwuliu.activity.EvaluateActivity
 import com.quansu.heifengwuliu.activity.VehicleListActivity
 import com.quansu.heifengwuliu.config.ConfigRx
 import com.quansu.heifengwuliu.model.DataInfoBean
@@ -281,6 +282,10 @@ open class SourceDetailsVModel : BViewModel<BRepository>() {
         }
         if(order_state==40){//待评价--司机对货主的评价
 
+            UiSwitch.bundle(repository().context, EvaluateActivity::class.java, Bundle().apply {
+                putString("order_id",order_id)
+            })
+
 
         }
 

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

@@ -223,7 +223,7 @@ class VehicleInfoVModel : BViewModel<BRepository>() {
     fun getInfo() {
         repository().lreq(NetEngine.service.getInfo("2"))
                 .doOnNext {
-                    if (it.ok(true)) {
+                    if (it.ok(false)) {
                         var bean = it.data() as InfoBean
                         if (null != bean) {
                             //todo:

app/src/main/java/com/quansu/heifengwuliu/widget/SearchView.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import androidx.databinding.DataBindingUtil
+import com.qmuiteam.qmui.kotlin.onClick
 import com.quansu.heifengwuliu.R
 import com.quansu.heifengwuliu.databinding.WidgetSearchBinding
 import com.quansu.heifengwuliu.vmodel.SearchVModel
@@ -33,5 +34,6 @@ class SearchView(context: Context, attrs: AttributeSet) : BaseLinearLayout(conte
             view = context as BView
         }
         binding = DataBindingUtil.inflate(LayoutInflater.from(context), R.layout.widget_search, this, true)
+
     }
 }

app/src/main/res/drawable/bg_mine_bottom.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+
+    <!-- 填充的颜色-->
+
+
+    <solid android:color="#F5F5F5" />
+
+    <corners android:topRightRadius="@dimen/dp_10"
+        android:topLeftRadius="@dimen/dp_10"
+        />
+
+</shape >

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

@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <data>
+
+        <variable
+            name="vm"
+            type="com.quansu.heifengwuliu.vmodel.EvaluateVModel" />
+
+    </data>
+
+    <LinearLayout xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/color_bg"
+        android:orientation="vertical">
+
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="17dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginEnd="16dp"
+            android:orientation="vertical"
+            android:paddingStart="11dp"
+            android:paddingEnd="8dp"
+            app:qmui_backgroundColor="@color/white"
+            app:qmui_borderColor="@color/white"
+            app:qmui_radius="4dp">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="24dp"
+                android:orientation="horizontal">
+
+
+                <ImageView
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    android:src="@drawable/bg_need_error" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="8dp"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textColor="@color/text_title"
+                        android:textSize="14sp"
+                        tools:text="订单编号：29837453657846" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="5dp"
+                        android:textColor="#A7A7B4"
+                        android:textSize="12sp"
+                        tools:text="2020-09-15 12:30:20" />
+
+
+                </LinearLayout>
+
+
+            </LinearLayout>
+
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="83dp"
+                android:layout_marginTop="35dp"
+                android:layout_marginBottom="10dp"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="9dp"
+                    android:layout_height="14dp"
+                    android:src="@drawable/ic_pen" />
+
+                <com.ysnows.base.widget.DelEditText
+                    android:id="@+id/edt_name"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/white"
+                    android:hint="评价本次订单的满意度"
+                    android:paddingStart="@dimen/dp_4"
+                    android:text="@={vm.name}"
+                    android:textColor="@color/text_title"
+                    android:textColorHint="#878889"
+                    android:textSize="@dimen/sp_12" />
+
+            </LinearLayout>
+
+        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="17dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginEnd="16dp"
+            android:gravity="center_vertical"
+            android:orientation="vertical"
+            android:paddingStart="11dp"
+            android:paddingEnd="8dp"
+            app:qmui_backgroundColor="@color/white"
+            app:qmui_borderColor="@color/white"
+            app:qmui_radius="4dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:text="给对方评分"
+                android:textColor="#5D5E5F"
+                android:textSize="14sp" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:layout_marginBottom="22dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="综合评分"
+                    android:textColor="#5D5E5F"
+                    android:textSize="14sp" />
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="43dp"
+                    android:layout_marginStart="17dp"
+                    android:layout_weight="1">
+                    
+                    <ImageView
+                        android:layout_width="18dp"
+                        android:src="@drawable/ic_star_on"
+                        android:layout_marginEnd="23dp"
+                        android:layout_height="18dp"/>
+
+                    <ImageView
+                        android:layout_width="18dp"
+                        android:src="@drawable/ic_star_on"
+                        android:layout_marginEnd="23dp"
+                        android:layout_height="18dp"/>
+                    <ImageView
+                        android:layout_width="18dp"
+                        android:src="@drawable/ic_star_off"
+                        android:layout_marginEnd="23dp"
+                        android:layout_height="18dp"/>
+                    <ImageView
+                        android:layout_width="18dp"
+                        android:src="@drawable/ic_star_off"
+                        android:layout_marginEnd="23dp"
+                        android:layout_height="18dp"/>
+                    <ImageView
+                        android:layout_width="18dp"
+                        android:src="@drawable/ic_star_off"
+                        android:layout_height="18dp"/>
+
+
+                </LinearLayout>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="2.0分"
+                    android:textColor="#878889"
+                    android:textSize="12sp" />
+
+
+            </LinearLayout>
+
+
+        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+
+    </LinearLayout>
+</layout>

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

@@ -165,7 +165,7 @@
                         android:layout_height="40dp"
                         android:layout_marginTop="21dp"
                         android:layout_marginBottom="21dp"
-                        tools:src="@drawable/bg_need_error" />
+                        android:src="@drawable/bg_need_error" />
 
                     <LinearLayout
                         android:layout_width="0dp"

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

@@ -1,28 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools" >
+    xmlns:tools="http://schemas.android.com/tools">
 
-    <data >
+    <data>
+        <import type="android.view.View" />
+        <variable
+            name="vm"
+            type="com.quansu.heifengwuliu.vmodel.AccountBillVModel" />
 
-    </data >
+    </data>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical" >
+        android:orientation="vertical">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="90dp"
-            android:padding="@dimen/dp_12" >
+            android:layout_height="242dp"
+            android:background="@drawable/ic_account_top">
 
             <TextView
                 android:id="@+id/available_balance_name"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_8"
+                android:layout_marginStart="31dp"
+                android:layout_marginTop="41dp"
                 android:text="@string/available_balance"
+                android:textColor="@color/white"
+                android:textSize="12sp"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
@@ -30,99 +37,185 @@
                 android:id="@+id/available_balance"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/dp_10"
-                android:text="￥2000"
-                app:layout_constraintBottom_toBottomOf="@id/available_balance_name"
-                app:layout_constraintStart_toEndOf="@id/available_balance_name"
-                app:layout_constraintTop_toTopOf="@id/available_balance_name" />
+                android:layout_marginTop="9dp"
+                tools:text="2000"
+                android:text="@{vm.info.money}"
 
-            <TextView
-                android:id="@+id/all_balance_name"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/all_balance"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
+                android:textColor="@color/white"
+                android:textSize="40sp"
+                app:layout_constraintStart_toStartOf="@id/available_balance_name"
+                app:layout_constraintTop_toBottomOf="@id/available_balance_name" />
 
-            <TextView
-                android:id="@+id/all_balance"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="￥20000"
-                app:layout_constraintBottom_toBottomOf="@id/all_balance_name"
-                app:layout_constraintStart_toEndOf="@id/all_balance_name"
-                app:layout_constraintTop_toTopOf="@id/all_balance_name" />
 
-            <TextView
-                android:id="@+id/freeze_balance_name"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/freeze_balance"
-                app:layout_constraintBottom_toBottomOf="@id/freeze_balance"
-                app:layout_constraintEnd_toStartOf="@id/freeze_balance"
-                app:layout_constraintTop_toTopOf="@id/freeze_balance" />
+            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
 
-            <TextView
-                android:id="@+id/freeze_balance"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="￥20000"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent" />
-
-            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-                android:id="@+id/btn_withdraw"
-                android:layout_width="70dp"
-                android:layout_height="28dp"
-                android:text="@string/withdraw"
-                app:layout_constraintBottom_toBottomOf="@id/available_balance_name"
+                android:layout_width="103dp"
+                android:layout_height="40dp"
+                android:layout_marginTop="30dp"
+                android:layout_marginEnd="34dp"
+                android:gravity="center"
+                android:orientation="horizontal"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="@id/available_balance_name"
-                app:qmui_radius="@dimen/dp_5" />
-
-            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-                android:id="@+id/btn_topup"
-                android:layout_width="70dp"
-                android:layout_height="28dp"
-                android:layout_marginEnd="@dimen/dp_8"
-                android:text="@string/topup"
-                app:layout_constraintBottom_toBottomOf="@id/available_balance_name"
-                app:layout_constraintEnd_toStartOf="@id/btn_withdraw"
-                app:layout_constraintTop_toTopOf="@id/available_balance_name"
-                app:qmui_radius="@dimen/dp_5" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout >
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="0.6dp"
-            android:background="@color/gray_lite" />
+                app:layout_constraintTop_toTopOf="parent"
+                app:qmui_backgroundColor="@color/white"
+                app:qmui_borderColor="@color/white"
+                app:qmui_borderWidth="1dp"
+                android:visibility="@{vm.user.isDriver()?View.GONE:View.VISIBLE}"
+                app:qmui_radius="25dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="去充值"
+                    android:textColor="#FFBC00"
+                    android:textSize="14sp" />
+
+                <ImageView
+                    android:layout_width="8dp"
+                    android:layout_height="9dp"
+                    android:layout_marginStart="7dp"
+                    android:src="@drawable/ic_yellow_right" />
+
+            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+
+            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+
+                android:layout_width="103dp"
+                android:layout_height="40dp"
+                android:layout_marginTop="78dp"
+                android:layout_marginEnd="34dp"
+                android:gravity="center"
+                android:orientation="horizontal"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:qmui_backgroundColor="@color/white"
+                app:qmui_borderColor="@color/white"
+                app:qmui_borderWidth="1dp"
+                app:qmui_radius="25dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="去提现"
+                    android:textColor="#FFBC00"
+                    android:textSize="14sp" />
+
+                <ImageView
+                    android:layout_width="8dp"
+                    android:layout_height="9dp"
+                    android:layout_marginStart="7dp"
+                    android:src="@drawable/ic_yellow_right" />
+
+            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="18dp"
+                android:orientation="horizontal"
+                app:layout_constraintTop_toBottomOf="@id/available_balance">
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center_horizontal"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/all_balance_name"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/all_balance"
+                        android:textColor="@color/white"
+                        android:textSize="13sp" />
+
+                    <TextView
+                        android:id="@+id/all_balance"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="4dp"
+                        tools:text="￥20000"
+                        android:text="@{@string/total_img+vm.info.frozen}"
+                        android:textColor="@color/white"
+                        android:textSize="20sp" />
+
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="1dp"
+                    android:layout_height="34dp"
+                    android:layout_marginTop="9dp"
+                    android:background="#FFFFFF" />
+
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center_horizontal"
+                    android:orientation="vertical">
+
+
+                    <TextView
+                        android:id="@+id/freeze_balance_name"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/freeze_balance"
+                        android:textColor="@color/white"
+                        android:textSize="13sp" />
+
+                    <TextView
+                        android:id="@+id/freeze_balance"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="5dp"
+                        tools:text="￥20000"
+                        android:text="@{@string/total_img+vm.info.can_use}"
+                        android:textColor="@color/white"
+                        android:textSize="20sp" />
+
+
+                </LinearLayout>
+
+
+            </LinearLayout>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+
 
         <LinearLayout
-            style="@style/mine_list"
-            android:layout_marginTop="4dp" >
+            android:layout_width="match_parent"
+            android:layout_height="56dp"
+            android:orientation="horizontal"
+            android:paddingStart="14dp"
+            android:gravity="center_vertical"
+            android:paddingEnd="12dp"
+            android:background="#F5F5F5"
+            android:layout_marginTop="4dp">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
+                android:textSize="18sp"
+                android:textColor="#26292F"
                 android:text="@string/bill_detail" />
 
             <ImageView
-                style="@style/mine_arrow_right"
+                android:layout_width="8dp"
+                android:layout_height="14dp"
                 android:src="@drawable/mine_right" />
 
-        </LinearLayout >
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="0.6dp"
-            android:background="@color/gray_lite" />
+        </LinearLayout>
 
         <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
             android:id="@+id/refresh_layout"
             android:layout_width="match_parent"
-            android:layout_height="match_parent" >
+            android:layout_height="match_parent">
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/recycler_view"
@@ -131,7 +224,7 @@
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                 tools:listitem="@layout/item_bill" />
 
-        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout >
-    </LinearLayout >
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+    </LinearLayout>
 
-</layout >
+</layout>

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

@@ -15,48 +15,255 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:orientation="horizontal"
-            android:paddingTop="29dp"
-            android:paddingBottom="6dp"
+            android:layout_height="wrap_content"
             android:background="@color/white"
             android:gravity="center"
-            android:layout_height="wrap_content">
+            android:orientation="horizontal"
+            android:paddingTop="29dp"
+            android:paddingBottom="6dp">
 
-        <TextView
-            android:layout_width="0dp"
-            android:layout_weight="1"
-            android:text="货源大厅"
-            android:textSize="20sp"
-            android:gravity="center"
-            android:layout_marginStart="49dp"
-            android:layout_height="wrap_content"/>
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="49dp"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="货源大厅"
+                android:textSize="20sp" />
 
             <TextView
+                android:id="@+id/tv_screen"
                 android:layout_width="wrap_content"
-                android:textSize="16sp"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="17dp"
                 android:text="筛选"
                 android:textColor="#FFBC00"
-                android:layout_marginEnd="17dp"
-                android:layout_height="wrap_content"/>
+                android:textSize="16sp" />
 
         </LinearLayout>
 
-        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-            android:id="@+id/refresh_layout"
+
+        <androidx.drawerlayout.widget.DrawerLayout
+            android:id="@+id/drawer_layout"
             android:layout_width="match_parent"
-            android:layout_marginTop="12dp"
             android:layout_height="match_parent">
 
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/recycler_view"
+            <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+                android:id="@+id/refresh_layout"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-                tools:listitem="@layout/item_index" />
+                android:layout_marginTop="12dp">
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/recycler_view"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                    tools:listitem="@layout/item_index" />
+
+            </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+            <!--右边抽屉菜单-->
+            <LinearLayout
+                android:id="@+id/menu_layout_right"
+                android:layout_width="260dp"
+                android:layout_height="match_parent"
+                android:layout_gravity="right"
+                android:background="@color/white"
+                android:clickable="true"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="#F5F5F5"
+                    android:focusable="true"
+                    android:focusableInTouchMode="true"
+                    android:orientation="vertical">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="8dp"
+                        android:layout_marginTop="13dp"
+                        android:layout_marginEnd="17dp"
+                        android:layout_marginBottom="11dp"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal">
+
+                        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="36dp"
+                            android:layout_weight="1"
+                            android:focusable="true"
+                            android:focusableInTouchMode="true"
+                            android:gravity="center_vertical"
+                            android:orientation="horizontal"
+                            android:paddingLeft="10dp"
+                            android:paddingRight="10dp"
+                            app:qmui_backgroundColor="@color/white"
+                            app:qmui_borderColor="@color/white"
+                            app:qmui_borderWidth="@dimen/dp_1"
+                            app:qmui_radius="11dp">
+
+                            <ImageView
+                                android:layout_width="20dp"
+                                android:layout_height="19dp"
+                                android:src="@drawable/stock_serch">
+
+                            </ImageView>
+
+                            <com.ysnows.base.widget.DelEditText
+                                android:id="@+id/et_name"
+                                android:layout_width="0dp"
+                                android:layout_height="match_parent"
+                                android:layout_marginLeft="15dp"
+                                android:layout_weight="1"
+                                android:background="@null"
+                                android:gravity="center_vertical"
+                                android:hint="请输入要搜索的内容"
+                                android:imeOptions="actionSearch|flagNoExtractUi"
+                                android:singleLine="true"
+                                android:textColor="@color/text_title"
+                                android:textColorHint="#95959A"
+                                android:textSize="13sp" />
+
+                        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+                        <TextView
+                            android:id="@+id/tv_search"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="9dp"
+                            android:gravity="center|left"
+                            android:text="搜索"
+                            android:textColor="#333333"
+                            android:textSize="13sp">
+
+                        </TextView>
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:paddingStart="12dp"
+                    android:paddingEnd="12dp">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="14dp"
+                        android:orientation="horizontal">
 
-        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+                        <TextView
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:text="出发地"
+                            android:textColor="#353637"
+                            android:textSize="14sp">
+
+                        </TextView>
+
+                        <TextView
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginEnd="64dp"
+                            android:layout_weight="1"
+                            android:text="目的地"
+                            android:textColor="#353637"
+                            android:textSize="14sp">
+
+                        </TextView>
+
+
+                    </LinearLayout>
+
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10dp"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal">
+
+                        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+                            android:layout_width="97dp"
+                            android:layout_height="28dp"
+                            android:text="请选择出发地"
+                            android:textColor="#FFBC00"
+                            android:textSize="12sp"
+                            app:qmui_backgroundColor="#FFF9E9"
+                            app:qmui_borderColor="#FFF9E9"
+                            app:qmui_radius="4dp" />
+
+
+                        <View
+                            android:layout_width="21dp"
+                            android:layout_height="2dp"
+                            android:layout_marginStart="9dp"
+                            android:layout_marginEnd="12dp"
+                            android:background="#EFF0F1" />
+
+
+                        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+                            android:layout_width="97dp"
+                            android:layout_height="28dp"
+                            android:text="请选择目的地"
+                            android:textColor="#FFBC00"
+                            android:textSize="12sp"
+                            app:qmui_backgroundColor="#FFF9E9"
+                            app:qmui_borderColor="#FFF9E9"
+                            app:qmui_radius="4dp" />
+
+
+                    </LinearLayout>
+
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="1" />
+
+
+                <FrameLayout
+                    android:id="@+id/fl_to_search"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:layout_marginEnd="@dimen/dp_16">
+
+                    <ImageView
+                        android:layout_width="match_parent"
+                        android:layout_height="106dp"
+                        android:src="@drawable/ic_details_grab" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:text="筛选"
+                        android:textColor="@color/white"
+                        android:textSize="16sp">
+
+                    </TextView>
+
+                </FrameLayout>
+
+
+            </LinearLayout>
+
+        </androidx.drawerlayout.widget.DrawerLayout>
 
 
     </LinearLayout>
 
+
 </layout>

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

@@ -1,88 +1,73 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools" >
+    xmlns:tools="http://schemas.android.com/tools">
 
-    <data >
+    <data>
+        <import type="android.view.View" />
 
         <variable
             name="vm"
             type="com.quansu.heifengwuliu.vmodel.MineVModel" />
-    </data >
+    </data>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/color_page_bg"
-        android:orientation="vertical" >
+        android:orientation="vertical">
 
         <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
             android:id="@+id/refresh_layout"
             android:layout_width="match_parent"
-            android:layout_height="match_parent" >
+            android:layout_height="match_parent">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:orientation="vertical" >
-                
+                android:orientation="vertical">
+
                 <LinearLayout
                     android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
                     android:background="@drawable/ic_mine_bg"
-                    app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintRight_toRightOf="parent"
-                    android:layout_height="wrap_content">
-                </LinearLayout>
-                
+                    app:layout_constraintTop_toTopOf="parent"></LinearLayout>
+
+
+                <ImageView
+                    android:id="@+id/img_info"
+                    android:layout_width="26dp"
+                    android:layout_height="26dp"
+                    android:layout_marginTop="30dp"
+                    android:layout_marginEnd="24dp"
+                    android:onClick="@{v->vm.goMsg()}"
+                    android:padding="2dp"
+                    android:src="@drawable/ic_msg"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
 
-                <RelativeLayout
-                    android:id="@+id/lay_title"
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/title_bar_height"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" >
-
-                    <TextView
-                        android:id="@+id/tv_title"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerInParent="true"
-                        android:layout_marginTop="20dp"
-                        android:text="个人中心"
-                        android:textColor="@color/text_title"
-                        android:textSize="@dimen/sp_16"
-                        android:textStyle="bold" />
-
-                    <ImageView
-                        android:layout_width="25dp"
-                        android:layout_height="25dp"
-                        android:layout_alignParentEnd="true"
-                        android:layout_centerVertical="true"
-                        android:layout_marginEnd="@dimen/dp_10"
-                        android:onClick="@{v->vm.goMsg()}"
-                        android:padding="@dimen/dp_2"
-                        android:src="@drawable/ic_msg" />
-
-                </RelativeLayout >
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/lay_user_info"
                     android:layout_width="match_parent"
-                    android:layout_height="106dp"
-                    android:paddingStart="@dimen/dp_10"
-                    android:paddingEnd="@dimen/dp_10"
+                    android:layout_height="158dp"
+                    android:layout_marginTop="7dp"
+                    android:background="@drawable/ic_mine_two"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/lay_title" >
+                    app:layout_constraintTop_toBottomOf="@id/img_info">
 
                     <com.qmuiteam.qmui.widget.QMUIRadiusImageView
                         android:id="@+id/img_user_avater"
                         android:layout_width="55dp"
                         android:layout_height="55dp"
-                        android:src="@drawable/ic_default_image"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
+                        android:layout_marginStart="38dp"
+                        android:layout_marginTop="34dp"
+                        android:src="@drawable/ic_default_avatar"
+                        app:layout_constraintLeft_toLeftOf="parent"
                         app:layout_constraintTop_toTopOf="parent"
+                        app:qmui_border_color="@color/white"
                         app:qmui_is_circle="true"
                         app:url="@{vm.user.avatar()}" />
 
@@ -90,9 +75,11 @@
                         android:id="@+id/tv_user_name"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/dp_10"
-                        android:layout_marginTop="10dp"
+                        android:layout_marginStart="7dp"
                         android:text="@{vm.user.name}"
+                        android:textColor="#111111"
+                        android:textSize="20sp"
+                        android:textStyle="bold"
                         app:layout_constraintStart_toEndOf="@id/img_user_avater"
                         app:layout_constraintTop_toTopOf="@id/img_user_avater"
                         tools:text="郑货主" />
@@ -102,231 +89,405 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="@dimen/dp_10"
+                        android:layout_marginTop="2dp"
                         android:layout_marginBottom="10dp"
                         android:text="@{vm.user.mobile}"
-                        app:layout_constraintBottom_toBottomOf="@id/img_user_avater"
+                        android:textColor="#606060"
+                        android:textSize="14sp"
                         app:layout_constraintStart_toEndOf="@id/img_user_avater"
+                        app:layout_constraintTop_toBottomOf="@id/tv_user_name"
                         tools:text="18353965350" />
 
-                    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+
+                    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
                         android:id="@+id/btn_identity_unverified"
-                        android:layout_width="80dp"
+                        android:layout_width="84dp"
                         android:layout_height="26dp"
-                        android:layout_marginEnd="@dimen/dp_10"
+                        android:layout_marginEnd="49dp"
+                        android:gravity="center"
                         android:onClick="@{v->vm.goPersonalVerify()}"
-                        android:text="@{vm.user.isInfo()?@string/identity_certified:@string/identity_unverified,default=@string/identity_unverified}"
-                        android:textColor="#459AEA"
-                        android:textSize="@dimen/sp_13"
+                        android:orientation="horizontal"
                         app:layout_constraintBottom_toTopOf="@id/btn_com_unverified"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintTop_toTopOf="@id/img_user_avater"
-                        app:qmui_backgroundColor="#E8F1FB"
-                        app:qmui_borderColor="#459AEA"
-                        app:qmui_radius="@dimen/dp_4" />
+                        app:qmui_borderColor="#FFBC00"
+                        app:qmui_borderWidth="1dp"
+                        app:qmui_radius="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{vm.user.isInfo()?@string/identity_certified:@string/identity_unverified,default=@string/identity_unverified}"
+                            android:textColor="#FFBC00"
+                            android:textSize="11sp"
+                            tools:text="身份未认证" />
 
-                    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+                        <ImageView
+                            android:layout_width="8dp"
+                            android:layout_height="10dp"
+                            android:layout_marginStart="4dp"
+                            android:src="@drawable/ic_yellow_right" />
+
+                    </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+
+                    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
                         android:id="@+id/btn_com_unverified"
-                        android:layout_width="80dp"
+                        android:layout_width="84dp"
                         android:layout_height="26dp"
-                        android:layout_marginTop="@dimen/dp_8"
-                        android:layout_marginEnd="@dimen/dp_10"
+                        android:layout_marginTop="8dp"
+                        android:layout_marginEnd="49dp"
+                        android:gravity="center"
                         android:onClick="@{v->vm.user.isDriver()?vm.goVehicleVerify():vm.goComVerify()}"
-                        android:text="@{vm.user.isDriver()? vm.user.isCar()? @string/vehicle_certified:@string/vehicle_unverified :vm.user.isCompany()?@string/com_certified:@string/com_unverified}"
-                        android:textColor="#459AEA"
-                        android:textSize="@dimen/sp_13"
+                        android:orientation="horizontal"
                         app:layout_constraintBottom_toBottomOf="@id/img_user_avater"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintTop_toBottomOf="@id/btn_identity_unverified"
-                        app:qmui_backgroundColor="#E8F1FB"
-                        app:qmui_borderColor="#459AEA"
-                        app:qmui_radius="@dimen/dp_4" />
+                        app:qmui_borderColor="#FFBC00"
+                        app:qmui_borderWidth="1dp"
+                        app:qmui_radius="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{vm.user.isDriver()? vm.user.isCar()? @string/vehicle_certified:@string/vehicle_unverified :vm.user.isCompany()?@string/com_certified:@string/com_unverified}"
+                            android:textColor="#FFBC00"
+                            android:textSize="11sp"
+                            tools:text="身份未认证" />
+
+                        <ImageView
+                            android:layout_width="8dp"
+                            android:layout_height="10dp"
+                            android:layout_marginStart="4dp"
+                            android:src="@drawable/ic_yellow_right" />
+
+                    </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
 
-                </androidx.constraintlayout.widget.ConstraintLayout >
+                </androidx.constraintlayout.widget.ConstraintLayout>
 
-                <com.qmuiteam.qmui.layout.QMUILinearLayout
-                    android:id="@+id/ll_center"
+                <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="10dp"
-                    android:layout_marginTop="@dimen/dp_20"
-                    android:layout_marginEnd="10dp"
-                    android:background="@color/white"
-                    android:orientation="horizontal"
-                    android:paddingTop="15dp"
-                    android:paddingBottom="20dp"
-                    app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintRight_toRightOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/lay_user_info" >
+                    android:layout_height="0dp"
+                    android:background="@drawable/bg_mine_bottom"
+                    android:orientation="vertical"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/lay_user_info"
+                    app:layout_constraintVertical_weight="1">
 
-                    <LinearLayout
-                        android:layout_width="0dp"
+                    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+                        android:id="@+id/ll_center"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="center"
-                        android:onClick="@{v->vm.goMyAccount()}"
-                        android:orientation="vertical" >
+                        android:layout_marginStart="10dp"
+                        android:layout_marginTop="10dp"
+                        android:layout_marginEnd="9dp"
+                        android:orientation="horizontal"
+                        android:paddingTop="16dp"
+                        android:paddingBottom="15dp"
+                        app:qmui_backgroundColor="@color/white"
+                        app:qmui_borderColor="@color/white"
+                        android:visibility="@{vm.user.isDriver()?View.VISIBLE:View.GONE}"
+                        app:qmui_radius="10dp">
+
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:onClick="@{v->vm.goMyAccount()}"
+                            android:orientation="vertical">
+
+                            <ImageView
+                                style="@style/img_mine"
+                                android:src="@drawable/ic_my_account" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="3dp"
+                                android:text="@string/my_account"
+                                android:textColor="#48494A"
+                                android:textSize="14sp" />
+
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:onClick="@{v->vm.goCollection()}"
 
-                        <ImageView
-                            style="@style/img_mine"
-                            android:src="@drawable/ic_default_image" />
+                            android:orientation="vertical">
 
-                        <TextView
-                            android:layout_width="wrap_content"
+                            <ImageView
+                                style="@style/img_mine"
+                                android:src="@drawable/ic_my_owner" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="1dp"
+                                android:text="我的货主"
+                                android:textColor="#48494A"
+                                android:textSize="14sp" />
+
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="6dp"
-                            android:text="@string/my_account" />
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:onClick="@{v->vm.goInvoice()}"
 
-                    </LinearLayout >
+                            android:orientation="vertical">
 
-                    <LinearLayout
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="center"
-                        android:onClick="@{v->vm.goCollection()}"
+                            <ImageView
+                                style="@style/img_mine"
+                                android:src="@drawable/ic_my_evaluate" />
 
-                        android:orientation="vertical" >
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="6dp"
+                                android:text="我的评价"
+                                android:textColor="#48494A"
+                                android:textSize="14sp" />
 
-                        <ImageView
-                            style="@style/img_mine"
-                            android:src="@drawable/ic_default_image" />
+                        </LinearLayout>
 
-                        <TextView
-                            android:layout_width="wrap_content"
+                        <LinearLayout
+                            android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="6dp"
-                            android:text="@string/my_collection" />
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:orientation="vertical">
+
+                            <ImageView
+                                style="@style/img_mine"
+                                android:src="@drawable/ic_my_service" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="1dp"
+                                android:text="@string/connect_service"
+                                android:textColor="#48494A"
+                                android:textSize="14sp" />
+
+                        </LinearLayout>
+
+                    </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
-                    </LinearLayout >
 
-                    <LinearLayout
-                        android:layout_width="0dp"
+                    <!--          货主端-->
+                    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="center"
-                        android:onClick="@{v->vm.goInvoice()}"
+                        android:layout_marginStart="10dp"
+                        android:layout_marginTop="10dp"
+                        android:layout_marginEnd="9dp"
+                        android:orientation="horizontal"
+                        android:paddingTop="16dp"
+                        android:paddingBottom="15dp"
+                        app:qmui_backgroundColor="@color/white"
+                        app:qmui_borderColor="@color/white"
+                        android:visibility="@{vm.user.isDriver()?View.GONE:View.VISIBLE}"
+                        app:qmui_radius="10dp">
+
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:onClick="@{v->vm.goMyAccount()}"
+                            android:orientation="vertical">
+
+                            <ImageView
+                                style="@style/img_mine"
+                                android:src="@drawable/ic_my_account" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="3dp"
+                                android:text="@string/my_account"
+                                android:textColor="#48494A"
+                                android:textSize="14sp" />
+
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:onClick="@{v->vm.goCollection()}"
 
-                        android:orientation="vertical" >
+                            android:orientation="vertical">
 
-                        <ImageView
-                            style="@style/img_mine"
-                            android:src="@drawable/ic_default_image" />
+                            <ImageView
+                                style="@style/img_mine"
+                                android:src="@drawable/ic_my_collection" />
 
-                        <TextView
-                            android:layout_width="wrap_content"
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="5dp"
+                                android:text="@string/my_collection"
+                                android:textColor="#48494A"
+                                android:textSize="14sp" />
+
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="6dp"
-                            android:text="@string/invoice_manage" />
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:onClick="@{v->vm.goInvoice()}"
 
-                    </LinearLayout >
+                            android:orientation="vertical">
 
-                    <LinearLayout
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="center"
-                        android:orientation="vertical" >
+                            <ImageView
+                                style="@style/img_mine"
+                                android:src="@drawable/ic_my_invoice" />
 
-                        <ImageView
-                            style="@style/img_mine"
-                            android:src="@drawable/ic_default_image" />
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="3dp"
+                                android:text="@string/invoice_manage"
+                                android:textColor="#48494A"
+                                android:textSize="14sp" />
 
-                        <TextView
-                            android:layout_width="wrap_content"
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="6dp"
-                            android:text="@string/connect_service" />
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:orientation="vertical">
 
-                    </LinearLayout >
+                            <ImageView
+                                style="@style/img_mine"
+                                android:src="@drawable/ic_my_service" />
 
-                </com.qmuiteam.qmui.layout.QMUILinearLayout >
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="1dp"
+                                android:text="@string/connect_service"
+                                android:textColor="#48494A"
+                                android:textSize="14sp" />
 
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
-                    android:orientation="vertical"
-                    app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintRight_toRightOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/ll_center" >
+                        </LinearLayout>
 
-                    <LinearLayout
-                        style="@style/mine_list"
-                        android:layout_marginTop="4dp" >
+                    </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
-                        <ImageView
-                            style="@style/mine_img"
-                            android:src="@drawable/ic_cloud_sync" />
 
-                        <TextView
-                            style="@style/mine_text"
-                            android:text="我的评价" />
+                    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
 
-                        <ImageView
-                            style="@style/mine_arrow_right"
-                            android:src="@drawable/mine_right" />
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="10dp"
+                        android:layout_marginTop="12dp"
+                        android:layout_marginEnd="9dp"
+                        android:orientation="vertical"
+                        android:paddingStart="15dp"
+                        android:paddingTop="19dp"
+                        android:paddingEnd="31dp"
+                        android:paddingBottom="19dp"
+                        app:qmui_backgroundColor="@color/white"
+                        app:qmui_borderColor="@color/white"
+                        app:qmui_radius="10dp">
 
-                    </LinearLayout >
+                        <LinearLayout
+                            style="@style/mine_list"
+                            android:visibility="@{vm.user.isDriver()?View.GONE:View.VISIBLE}"
+                            >
 
-                    <View style="@style/line_mine" />
+                            <ImageView
+                                style="@style/mine_img"
+                                android:src="@drawable/my_coment" />
 
-                    <LinearLayout style="@style/mine_list"
-                        android:onClick="@{v->vm.goAdress()}"
-                        >
+                            <TextView
+                                style="@style/mine_text"
+                                android:text="我的评价" />
 
-                        <ImageView
-                            style="@style/mine_img"
-                            android:src="@drawable/ic_backup" />
+                            <ImageView
+                                style="@style/mine_arrow_right"
+                                android:src="@drawable/mine_right" />
 
-                        <TextView
-                            style="@style/mine_text"
-                            android:text="地址薄" />
+                        </LinearLayout>
 
-                        <ImageView
-                            style="@style/mine_arrow_right"
-                            android:src="@drawable/mine_right" />
+                        <LinearLayout
+                            android:visibility="@{vm.user.isDriver()?View.GONE:View.VISIBLE}"
+                            style="@style/mine_list"
+                            android:onClick="@{v->vm.goAdress()}">
 
-                    </LinearLayout >
+                            <ImageView
+                                style="@style/mine_img"
+                                android:src="@drawable/my_address" />
 
+                            <TextView
+                                style="@style/mine_text"
+                                android:text="地址薄" />
 
+                            <ImageView
+                                style="@style/mine_arrow_right"
+                                android:src="@drawable/mine_right" />
 
-                    <View style="@style/line_mine" />
+                        </LinearLayout>
 
-                    <LinearLayout
-                        android:id="@+id/lay_settings"
-                        style="@style/mine_list"
-                        android:onClick="@{v->vm.goSettings()}" >
+                        <LinearLayout
+                            android:id="@+id/lay_settings"
+                            style="@style/mine_list"
+                            android:onClick="@{v->vm.goSettings()}">
 
-                        <ImageView
-                            style="@style/mine_img"
-                            android:src="@drawable/ic_private_settings" />
+                            <ImageView
+                                style="@style/mine_img"
+                                android:src="@drawable/my_setting" />
 
-                        <TextView
-                            style="@style/mine_text"
-                            android:text="设置" />
+                            <TextView
+                                style="@style/mine_text"
+                                android:text="设置" />
 
-                        <ImageView
-                            style="@style/mine_arrow_right"
-                            android:src="@drawable/mine_right" />
+                            <ImageView
+                                style="@style/mine_arrow_right"
+                                android:src="@drawable/mine_right" />
 
-                    </LinearLayout >
+                        </LinearLayout>
 
-                    <View style="@style/line_mine" />
 
-                </LinearLayout >
+                    </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="0dp"
+                        android:layout_weight="1" />
+
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center"
+                        android:layout_marginBottom="14dp"
+                        android:textSize="12sp"
+                        android:onClick="@{v->vm.callPhone()}"
+                        android:text="平台联系方式：1835397689"
+                        android:textColor="#979899"
+                         />
+
+                </LinearLayout>
 
-                <TextView
-                    style="@style/mine_text"
-                    android:layout_gravity="center"
-                    android:layout_marginBottom="@dimen/dp_40"
-                    android:onClick="@{v->vm.callPhone()}"
-                    android:text="平台联系方式：1835397689"
-                    android:textColor="@color/qmui_config_color_gray_5"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent" />
 
-            </androidx.constraintlayout.widget.ConstraintLayout >
-        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout >
-    </LinearLayout >
-</layout >
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+    </LinearLayout>
+</layout>

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

@@ -6,7 +6,7 @@
 
         <variable
             name="item"
-            type="com.quansu.heifengwuliu.model.Msg" />
+            type="com.quansu.heifengwuliu.model.AmountList" />
 
     </data >
 
@@ -15,24 +15,27 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:paddingLeft="@dimen/dp_10"
-        android:paddingTop="@dimen/dp_10"
-        android:paddingRight="@dimen/dp_10" >
+        android:paddingLeft="12dp"
+        android:paddingRight="13dp" >
 
+
+<!--          android:src="@drawable/ic_account_out"-->
         <ImageView
             android:id="@+id/img_icon"
-            android:layout_width="45dp"
-            android:layout_height="45dp"
+            android:layout_width="44dp"
+            android:layout_height="44dp"
+            android:layout_marginTop="22dp"
             android:layout_centerVertical="true"
-            android:padding="@dimen/dp_13"
-            android:src="@{item.checked==0?@drawable/uncomplete:@drawable/complete}"
-            tools:src="@mipmap/ic_launcher" />
+            tools:src="@drawable/ic_account_enter"
+            android:src="@{item.set==1?@drawable/ic_account_enter:@drawable/ic_account_out}"
+
+             />
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:layout_marginStart="@dimen/dp_8"
+            android:layout_marginStart="12dp"
             android:layout_toEndOf="@id/img_icon"
             android:orientation="vertical" >
 
@@ -42,19 +45,20 @@
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
                 android:maxLines="1"
-                android:text="@{item.title}"
-                android:textColor="@{item.checked==1?@color/text_hint:@color/text_black}"
-                android:textSize="@dimen/sp_16"
-                tools:text="@string/app_name" />
+                android:textColor="#333333"
+                android:textSize="@dimen/sp_14"
+                android:text="@{item.data}"
+                tools:text="提现-提现到微信" />
 
             <TextView
                 android:id="@+id/tv_desc"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_2"
+                android:layout_marginTop="5dp"
                 android:text="@{item.create_time}"
-                android:textColor="@{item.checked==1?@color/text_hint:@color/text_black}"
-                tools:text="@string/app_name" />
+                android:textColor="#979899"
+                android:textSize="14sp"
+                tools:text="今天 11:46" />
 
         </LinearLayout >
 
@@ -71,16 +75,20 @@
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
                 android:maxLines="1"
-                android:text="@{item.title}"
-                tools:text="@string/app_name" />
+                android:textColor="#333333"
+                android:textSize="12sp"
+                android:text="@{item.set==1?@string/plus+item.money:@string/reduce+item.money}"
+                tools:text="-500.00" />
 
             <TextView
                 android:id="@+id/tv_available_balance"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_2"
-                android:text="@{item.create_time}"
-                tools:text="@string/app_name" />
+                android:layout_marginTop="5dp"
+                android:textColor="#979899"
+                android:textSize="13sp"
+                android:text="@{@string/yu+item.total}"
+                tools:text="当前余额：20000" />
 
         </LinearLayout >
 
@@ -88,8 +96,8 @@
             android:layout_width="match_parent"
             android:layout_height="1dp"
             android:layout_alignParentBottom="true"
-            android:layout_marginLeft="@dimen/dp_20"
-            android:layout_marginTop="@dimen/dp_10"
-            android:background="@color/llGray" />
+            android:layout_marginLeft="68dp"
+            android:layout_marginTop="15dp"
+            android:background="#E5E5E5" />
     </RelativeLayout >
-</layout >
+</layout >

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

@@ -20,16 +20,16 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="18dp"
+            android:layout_marginStart="17dp"
             android:layout_marginTop="12dp"
-            android:layout_marginRight="18dp"
-            android:layout_marginBottom="18dp"
+            android:layout_marginEnd="15dp"
+            android:layout_marginBottom="12dp"
             android:gravity="center_vertical"
             android:orientation="horizontal" >
 
             <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
                 android:layout_width="0dp"
-                android:layout_height="40dp"
+                android:layout_height="36dp"
                 android:layout_weight="1"
                 android:focusable="true"
                 android:focusableInTouchMode="true"
@@ -38,13 +38,13 @@
                 android:paddingLeft="10dp"
                 android:paddingRight="10dp"
                 app:qmui_backgroundColor="@color/white"
-                app:qmui_borderColor="#BEBEBE"
+                app:qmui_borderColor="@color/white"
                 app:qmui_borderWidth="@dimen/dp_1"
-                app:qmui_radius="@dimen/dp_4" >
+                app:qmui_radius="11dp" >
 
                 <ImageView
-                    android:layout_width="13dp"
-                    android:layout_height="13dp"
+                    android:layout_width="20dp"
+                    android:layout_height="19dp"
                     android:src="@drawable/stock_serch" >
 
                 </ImageView >
@@ -61,9 +61,9 @@
                     android:imeOptions="actionSearch|flagNoExtractUi"
                     android:singleLine="true"
                     android:text="@={vm.k}"
-                    android:textColor="#2F2F31"
-                    android:textColorHint="#929390"
-                    android:textSize="14sp"
+                    android:textColor="@color/text_title"
+                    android:textColorHint="#95959A"
+                    android:textSize="13sp"
                     app:on_action="@{(a,b,c)->vm.onAction(b)}" />
 
                 <ImageView
@@ -81,12 +81,12 @@
                 android:id="@+id/tv_search"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="18dp"
+                android:layout_marginStart="10dp"
                 android:gravity="center|left"
                 android:onClick="@{v->vm.firstReq()}"
                 android:text="搜索"
-                android:textColor="#3274F6"
-                android:textSize="15sp" >
+                android:textColor="#333333"
+                android:textSize="13sp" >
 
             </TextView >
 

app/src/main/res/values/strings.xml

@@ -488,6 +488,12 @@ Api 已达到使用限制
     <string name="right_bracket">)</string>
     <string name="deliver_goods">发货</string>
     <string name="discharge">卸</string>
+    <string name="yu">当前余额：</string>
+    <string name="plus">+</string>
+
+    <string name="reduce">-</string>
+
+
 
 
 </resources >

app/src/main/res/values/styles.xml

@@ -202,33 +202,31 @@
         <item name="android:layout_height" >45dp</item >
         <item name="android:gravity" >center_vertical</item >
         <item name="android:orientation" >horizontal</item >
-        <item name="android:paddingLeft" >12dp</item >
-        <item name="android:paddingRight" >12dp</item >
+
     </style >
 
     <style name="mine_img" >
-        <item name="android:layout_width" >17dp</item >
-        <item name="android:layout_height" >17dp</item >
+        <item name="android:layout_width" >24dp</item >
+        <item name="android:layout_height" >24dp</item >
     </style >
 
     <style name="mine_text" >
         <item name="android:layout_width" >wrap_content</item >
         <item name="android:layout_height" >wrap_content</item >
-        <item name="android:layout_marginLeft" >11dp</item >
+        <item name="android:layout_marginLeft" >8dp</item >
         <item name="android:layout_weight" >1</item >
-        <item name="android:textColor" >#333435</item >
-        <item name="android:textSize" >16sp</item >
+        <item name="android:textColor" >#3D3D3D</item >
+        <item name="android:textSize" >15sp</item >
     </style >
 
     <style name="mine_arrow_right" >
-        <item name="android:layout_width" >7dp</item >
-        <item name="android:layout_height" >12dp</item >
+        <item name="android:layout_width" >9dp</item >
+        <item name="android:layout_height" >9dp</item >
     </style >
 
     <style name="img_mine" >
-        <item name="android:layout_width" >50dp</item >
-        <item name="android:layout_height" >50dp</item >
-        <item name="android:padding" >@dimen/dp_4</item >
+        <item name="android:layout_width" >40dp</item >
+        <item name="android:layout_height" >40dp</item >
     </style >
 
     <style name="line_mine" >

base/src/main/java/com/ysnows/base/base/BTabActivity.kt

@@ -61,8 +61,8 @@ abstract class BTabActivity<VM : BViewModel<*>, B : ViewDataBinding> : BActivity
         val builder = tabs().tabBuilder()
         builder
                 .skinChangeWithTintColor(false)
-                .setSelectColor(Color.parseColor("#2E4E71"))
-                .setNormalColor(Color.parseColor("#666666"))
+                .setSelectColor(Color.parseColor("#FFBC00"))
+                .setNormalColor(Color.parseColor("#302E2F"))
                 .setTypeface(Typeface.DEFAULT_BOLD, Typeface.DEFAULT)
                 .setDynamicChangeIconColor(false)