Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/AndroidManifest.xml

app/src/main/AndroidManifest.xml

@@ -99,6 +99,8 @@
         <activity android:name=".activity.AccountActivity" />
         <activity android:name=".activity.PersonalVerityActivity" />
         <activity android:name=".activity.AddressActivity"/>
+        <activity android:name=".activity.ComVerityActivity" />
+        <activity android:name=".activity.CollectionActivity" />
 
     </application >
 

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

@@ -0,0 +1,38 @@
+package com.quansu.heifengwuliu.activity
+
+import android.view.View
+import com.quansu.heifengwuliu.R
+import com.quansu.heifengwuliu.adapter.CollectionAdapter
+import com.quansu.heifengwuliu.base.MBRActivity
+import com.quansu.heifengwuliu.databinding.ActivityCollectionBinding
+import com.quansu.heifengwuliu.utils.net.NetEngine
+import com.ysnows.base.base.BRRepository
+import com.ysnows.base.base.BRViewModel
+import com.ysnows.base.net.IResponse
+import io.reactivex.Observable
+
+class CollectionActivity : MBRActivity<BRViewModel<BRRepository>, CollectionAdapter, ActivityCollectionBinding>() {
+
+    override fun initView(view: View?) {
+        super.initView(view)
+        titleBar()?.setRightText(getString(R.string.all_select))
+    }
+
+
+    override fun binding(): ActivityCollectionBinding {
+        return ActivityCollectionBinding.inflate(layoutInflater)
+    }
+
+
+    override fun initAdapter(): CollectionAdapter {
+        return CollectionAdapter()
+    }
+
+    override fun api(): Observable<out IResponse<*>> {
+        return NetEngine.service.taskList("", vm?.repository()?.autoPage()!!)
+    }
+
+    override fun title(): String? {
+        return getString(R.string.my_collection)
+    }
+}

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

@@ -0,0 +1,28 @@
+package com.quansu.heifengwuliu.activity
+
+import com.quansu.heifengwuliu.R
+import com.quansu.heifengwuliu.base.MBActivity
+import com.quansu.heifengwuliu.databinding.ActivityComVerifyBinding
+import com.quansu.heifengwuliu.repository.ComVerifyRepository
+import com.quansu.heifengwuliu.vmodel.ComVerityVModel
+import com.ysnows.base.base.BRepository
+
+class ComVerityActivity : MBActivity<ComVerityVModel, ActivityComVerifyBinding>() {
+
+
+    override fun title(): String? {
+        return getString(R.string.com_verify)
+    }
+
+    override fun binding(): ActivityComVerifyBinding {
+        return ActivityComVerifyBinding.inflate(layoutInflater)
+    }
+
+    override fun vmClass(): Class<ComVerityVModel> {
+        return ComVerityVModel::class.java
+    }
+
+    override fun createRepository(): BRepository {
+        return ComVerifyRepository()
+    }
+}

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

@@ -1,8 +1,11 @@
 package com.quansu.heifengwuliu.activity
 
+import com.quansu.heifengwuliu.R
 import com.quansu.heifengwuliu.base.MBActivity
 import com.quansu.heifengwuliu.databinding.ActivityPersonalVerifyBinding
+import com.quansu.heifengwuliu.repository.PersonalVerifyRepository
 import com.quansu.heifengwuliu.vmodel.PersonalVerityVModel
+import com.ysnows.base.base.BRepository
 
 class PersonalVerityActivity : MBActivity<PersonalVerityVModel, ActivityPersonalVerifyBinding>() {
 
@@ -10,4 +13,17 @@ class PersonalVerityActivity : MBActivity<PersonalVerityVModel, ActivityPersonal
         return ActivityPersonalVerifyBinding.inflate(layoutInflater)
     }
 
+
+    override fun vmClass(): Class<PersonalVerityVModel> {
+        return PersonalVerityVModel::class.java
+    }
+
+    override fun createRepository(): BRepository {
+        return PersonalVerifyRepository()
+    }
+
+
+    override fun title(): String? {
+        return getString(R.string.identity_verify)
+    }
 }

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

@@ -0,0 +1,13 @@
+package com.quansu.heifengwuliu.adapter
+
+import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
+import com.quansu.heifengwuliu.R
+import com.quansu.heifengwuliu.databinding.ItemCollectionBinding
+import com.quansu.heifengwuliu.model.Vehicle
+import com.ysnows.base.base.BAdapter
+
+class CollectionAdapter : BAdapter<Vehicle, BaseDataBindingHolder<ItemCollectionBinding>>(R.layout.item_collection) {
+    override fun convert(holder: BaseDataBindingHolder<ItemCollectionBinding>, item: Vehicle) {
+        holder.dataBinding?.item = item
+    }
+}

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

@@ -0,0 +1,13 @@
+package com.quansu.heifengwuliu.adapter
+
+import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
+import com.quansu.heifengwuliu.R
+import com.quansu.heifengwuliu.databinding.ItemOrderBinding
+import com.quansu.heifengwuliu.model.Order
+import com.ysnows.base.base.BAdapter
+
+class OrderListAdapter : BAdapter<Order, BaseDataBindingHolder<ItemOrderBinding>>(R.layout.item_order) {
+    override fun convert(holder: BaseDataBindingHolder<ItemOrderBinding>, item: Order) {
+        holder.dataBinding?.item = item
+    }
+}

app/src/main/java/com/quansu/heifengwuliu/base/MBActivity.kt

@@ -34,6 +34,10 @@ abstract class MBActivity<VM : BViewModel<*>, B : ViewDataBinding> : BActivity<V
         return R.color.black
     }
 
+    override fun rightTextColor(): Int {
+        return R.color.black
+    }
+
     override fun backDrawable(): Int {
         return R.drawable.ic_back_black
     }

app/src/main/java/com/quansu/heifengwuliu/base/MBFragment.kt

@@ -1,7 +1,7 @@
 package com.quansu.heifengwuliu.base
 
 import androidx.databinding.ViewDataBinding
-import com.quansu.heifengwuliu.activity.LoginActivity
+import com.quansu.heifengwuliu.R
 import com.quansu.heifengwuliu.activity.OneLoginActivity
 import com.quansu.heifengwuliu.model.User
 import com.ysnows.base.base.BFragment
@@ -26,4 +26,22 @@ abstract class MBFragment<VM : BViewModel<*>, B : ViewDataBinding> : BFragment<V
     override fun user(): IUser? {
         return User.get()
     }
+
+
+    override fun bgColor(): Int {
+        return R.color.white
+    }
+
+    override fun titleColor(): Int {
+        return R.color.black
+    }
+
+    override fun rightTextColor(): Int {
+        return R.color.black
+    }
+
+    override fun backDrawable(): Int {
+        return R.drawable.ic_back_black
+    }
+
 }

app/src/main/java/com/quansu/heifengwuliu/base/MBRActivity.kt

@@ -24,6 +24,7 @@ abstract class MBRActivity<VM : BRViewModel<*>, A : BaseQuickAdapter<*, out Base
         UiSwitch.single(context(), OneLoginActivity::class.java)
 //     toast(R.string.please_login)
     }
+
     override fun user(): IUser? {
         return User.get()
     }
@@ -40,4 +41,9 @@ abstract class MBRActivity<VM : BRViewModel<*>, A : BaseQuickAdapter<*, out Base
         return R.drawable.ic_back_black
     }
 
+    override fun rightTextColor(): Int {
+        return R.color.black
+    }
+
+
 }

app/src/main/java/com/quansu/heifengwuliu/base/MBRFragment.kt

@@ -3,6 +3,7 @@ package com.quansu.heifengwuliu.base
 import androidx.databinding.ViewDataBinding
 import com.chad.library.adapter.base.BaseQuickAdapter
 import com.chad.library.adapter.base.viewholder.BaseViewHolder
+import com.quansu.heifengwuliu.R
 import com.quansu.heifengwuliu.activity.OneLoginActivity
 import com.quansu.heifengwuliu.model.User
 import com.ysnows.base.base.BRFragment
@@ -30,4 +31,20 @@ abstract class MBRFragment<VM : BRViewModel<*>, A : BaseQuickAdapter<*, out Base
     }
 
 
+    override fun bgColor(): Int {
+        return R.color.white
+    }
+
+    override fun titleColor(): Int {
+        return R.color.black
+    }
+
+    override fun rightTextColor(): Int {
+        return R.color.black
+    }
+
+    override fun backDrawable(): Int {
+        return R.drawable.ic_back_black
+    }
+
 }

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

@@ -0,0 +1,44 @@
+package com.quansu.heifengwuliu.fragment
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import com.quansu.heifengwuliu.adapter.OrderListAdapter
+import com.quansu.heifengwuliu.base.MBRFragment
+import com.quansu.heifengwuliu.databinding.FragmentOrderListBinding
+import com.quansu.heifengwuliu.model.Order
+import com.quansu.heifengwuliu.utils.net.NetEngine
+import com.quansu.heifengwuliu.vmodel.OrderListVModel
+import com.ysnows.base.net.IResponse
+import io.reactivex.Observable
+
+class OrderListFragment : MBRFragment<OrderListVModel, OrderListAdapter, FragmentOrderListBinding>() {
+
+    override fun init(savedInstanceState: Bundle?) {
+        super.init(savedInstanceState)
+
+        adapter().setList(arrayListOf(Order(1), Order(1), Order(1), Order(1), Order(1), Order(1), Order(1), Order(1), Order(1), Order(1), Order(1), Order(1), Order(1), Order(1), Order(1), Order(1)
+        ))
+
+    }
+
+    override fun initAdapter(): OrderListAdapter {
+        return OrderListAdapter()
+    }
+
+    override fun api(): Observable<out IResponse<*>> {
+        return NetEngine.service.taskList("", vm.repository().autoPage())
+    }
+
+    override fun binding(inflater: LayoutInflater, container: ViewGroup?): FragmentOrderListBinding {
+        return FragmentOrderListBinding.inflate(layoutInflater, container, false)
+    }
+
+    override fun title(): String? {
+        return null
+    }
+
+    override fun vmClass(): Class<OrderListVModel> {
+        return OrderListVModel::class.java
+    }
+}

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

@@ -1,9 +1,17 @@
 package com.quansu.heifengwuliu.fragment
 
+import android.graphics.Color
+import android.graphics.Typeface
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentPagerAdapter
+import androidx.viewpager.widget.PagerAdapter
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+import com.qmuiteam.qmui.widget.tab.QMUITabIndicator
+import com.quansu.heifengwuliu.R
 import com.quansu.heifengwuliu.base.MBFragment
-import com.quansu.heifengwuliu.databinding.FragmentMineBinding
 import com.quansu.heifengwuliu.databinding.FragmentWaybillBinding
 import com.ysnows.base.base.BRepository
 import com.ysnows.base.base.BViewModel
@@ -12,16 +20,82 @@ import com.ysnows.base.base.BViewModel
  *Created by shihuiyun
  *on 2020/9/9
  */
-class WayBillFragment  : MBFragment<BViewModel<BRepository>, FragmentWaybillBinding>(){
+class WayBillFragment : MBFragment<BViewModel<BRepository>, FragmentWaybillBinding>() {
+
+    override fun initView(view: View?) {
+        super.initView(view)
+
+        titleBar?.tvRight?.text = getString(R.string.filter)
+
+        initTabs()
+        initPager()
+
+    }
+
+    private fun initPager() {
+        val mPagerAdapter: PagerAdapter = object : FragmentPagerAdapter(childFragmentManager) {
+            override fun getItem(position: Int): Fragment {
+                return OrderListFragment()
+            }
+
+            override fun getCount(): Int {
+                return 5
+            }
+        }
+        binding.pager.adapter = mPagerAdapter
+        binding.tabs.setupWithViewPager(binding.pager, false)
+    }
+
+
+    private fun initTabs() {
+        binding.tabs.setIndicator(QMUITabIndicator(QMUIDisplayHelper.dp2px(context(), 3), false, true))
+        val builder = binding.tabs.tabBuilder()
+        builder
+                .skinChangeWithTintColor(false)
+                .setSelectColor(Color.parseColor("#2E4E71"))
+                .setNormalColor(Color.parseColor("#666666"))
+                .setTypeface(Typeface.DEFAULT_BOLD, Typeface.DEFAULT_BOLD)
+                .setDynamicChangeIconColor(false)
+
+        val component = builder
+                .setText(getString(R.string.all))
+                .build(context())
+
+        val util = builder
+                .setText(getText(R.string.to_order_receive))
+                .build(context())
+
+        val ongoing = builder
+                .setText(getText(R.string.on_going))
+                .build(context())
+
+        val canceled = builder
+                .setText(getText(R.string.canceled))
+                .build(context())
+
+        val completed = builder
+                .setText(getText(R.string.completed))
+                .build(context())
+
+
+        binding.tabs
+                .addTab(component)
+                .addTab(util)
+                .addTab(ongoing)
+                .addTab(canceled)
+                .addTab(completed)
+    }
 
 
     override fun binding(inflater: LayoutInflater, container: ViewGroup?): FragmentWaybillBinding {
         return FragmentWaybillBinding.inflate(layoutInflater)
     }
 
-
     override fun title(): String? {
-        return null
+        return getString(R.string.source_information)
     }
 
+    override fun backable(): Boolean {
+        return false
+    }
 }

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

@@ -0,0 +1,9 @@
+package com.quansu.heifengwuliu.model
+
+
+data class Order(
+        val status: Int
+) {
+
+
+}

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

@@ -0,0 +1,12 @@
+package com.quansu.heifengwuliu.model
+
+
+data class Vehicle(
+        val title: String?,
+        val content: String?,
+        val create_time: String?,
+        val checked: Int?
+) {
+
+
+}

app/src/main/java/com/quansu/heifengwuliu/repository/ComVerifyRepository.kt

@@ -0,0 +1,7 @@
+package com.quansu.heifengwuliu.repository
+
+import com.ysnows.base.base.BRepository
+
+class ComVerifyRepository : BRepository() {
+
+}

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

@@ -0,0 +1,28 @@
+package com.quansu.heifengwuliu.vmodel
+
+import androidx.databinding.Bindable
+import androidx.lifecycle.MutableLiveData
+import com.quansu.heifengwuliu.BR
+import com.quansu.heifengwuliu.repository.ComVerifyRepository
+import com.ysnows.base.base.BViewModel
+
+class ComVerityVModel : BViewModel<ComVerifyRepository>() {
+
+    var imgBL: MutableLiveData<String> = MutableLiveData("")
+
+    @Bindable
+    var name: String? = null
+        set(value) {
+            field = value
+            notifyPropertyChanged(BR.name)
+        }
+
+    @Bindable
+    var iDNumber: String? = null
+        set(value) {
+            field = value
+            notifyPropertyChanged(BR.iDNumber)
+        }
+
+
+}

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

@@ -1,9 +1,7 @@
 package com.quansu.heifengwuliu.vmodel
 
 import androidx.lifecycle.MutableLiveData
-import com.quansu.heifengwuliu.activity.AccountActivity
-import com.quansu.heifengwuliu.activity.MsgActivity
-import com.quansu.heifengwuliu.activity.SettingsActivity
+import com.quansu.heifengwuliu.activity.*
 import com.quansu.heifengwuliu.model.User
 import com.quansu.heifengwuliu.repository.MineRepository
 import com.ysnows.base.base.BViewModel
@@ -24,13 +22,20 @@ open class MineVModel : BViewModel<MineRepository>() {
         single(MsgActivity::class.java)
     }
 
-    fun goVerify() {
+    fun goVehicleVerify() {
         single(MsgActivity::class.java)
     }
 
+    fun goComVerify() {
+        single(ComVerityActivity::class.java)
+    }
+
+    fun goCollection() {
+        single(CollectionActivity::class.java)
+    }
 
     fun goPersonalVerify() {
-        single(MsgActivity::class.java)
+        single(PersonalVerityActivity::class.java)
     }
 
     fun goMyAccount() {

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

@@ -0,0 +1,11 @@
+package com.quansu.heifengwuliu.vmodel
+
+import com.ysnows.base.base.BRRepository
+import com.ysnows.base.base.BRViewModel
+
+class OrderListVModel : BRViewModel<BRRepository>() {
+
+    override fun firstReq() {
+//        super.firstReq()
+    }
+}

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

@@ -1,9 +1,30 @@
 package com.quansu.heifengwuliu.vmodel
 
+import androidx.databinding.Bindable
+import androidx.lifecycle.MutableLiveData
+import com.quansu.heifengwuliu.BR
 import com.quansu.heifengwuliu.repository.PersonalVerifyRepository
 import com.ysnows.base.base.BViewModel
 
 class PersonalVerityVModel : BViewModel<PersonalVerifyRepository>() {
 
+    var imgIDMan: MutableLiveData<String> = MutableLiveData("")
+    var imgIDEmblem: MutableLiveData<String> = MutableLiveData("")
+
+
+    @Bindable
+    var name: String? = null
+        set(value) {
+            field = value
+            notifyPropertyChanged(BR.name)
+        }
+
+    @Bindable
+    var iDNumber: String? = null
+        set(value) {
+            field = value
+            notifyPropertyChanged(BR.iDNumber)
+        }
+
 
 }

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

@@ -0,0 +1,47 @@
+<?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" >
+
+    <data >
+
+    </data >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical" >
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" >
+
+            <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+                android:id="@+id/refresh_layout"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" >
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/recycler_view"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:paddingBottom="70dp"
+                    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                    tools:listitem="@layout/item_collection" />
+
+            </androidx.swiperefreshlayout.widget.SwipeRefreshLayout >
+
+            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_40"
+                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" />
+
+        </FrameLayout >
+
+    </LinearLayout >
+
+</layout >

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

@@ -0,0 +1,128 @@
+<?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" >
+
+    <data >
+
+        <variable
+            name="vm"
+            type="com.quansu.heifengwuliu.vmodel.ComVerityVModel" />
+    </data >
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingStart="@dimen/dp_14"
+        android:paddingEnd="@dimen/dp_14" >
+
+        <TextView
+            android:id="@+id/tv_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_55"
+            android:text="@string/bl_upload"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <com.qmuiteam.qmui.widget.QMUIRadiusImageView
+            android:id="@+id/img_id_man"
+            android:layout_width="match_parent"
+            android:layout_height="150dp"
+            android:layout_marginTop="@dimen/dp_8"
+            android:src="@drawable/ic_default_image"
+            app:layout_constraintStart_toStartOf="@id/tv_title"
+            app:layout_constraintTop_toBottomOf="@id/tv_title"
+            app:qmui_radius="1dp"
+            app:url="@{vm.imgBL}" />
+
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+            android:id="@+id/lay_input"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_12"
+            android:gravity="center_vertical"
+            android:orientation="vertical"
+            android:paddingStart="@dimen/dp_8"
+            android:paddingEnd="@dimen/dp_14"
+            android:visibility="gone"
+            app:layout_constraintTop_toBottomOf="@id/img_id_man"
+            app:qmui_borderColor="#F4F3F9"
+            app:qmui_borderWidth="@dimen/dp_1"
+            app:rv_radius="25dp" >
+
+            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:gravity="center_vertical"
+                android:paddingStart="@dimen/dp_8"
+                android:paddingEnd="@dimen/dp_14" >
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/name" />
+
+                <com.ysnows.base.widget.DelEditText
+                    android:id="@+id/edt_name"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@color/white"
+                    android:hint="@string/name_must_equal_to_id_card"
+                    android:inputType="phone"
+                    android:paddingStart="@dimen/dp_18"
+                    android:text="@={vm.name}"
+                    android:textSize="@dimen/sp_13" />
+
+            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout >
+
+            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:gravity="center_vertical"
+                android:paddingStart="@dimen/dp_8"
+                android:paddingEnd="@dimen/dp_14" >
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/id_number" />
+
+                <com.ysnows.base.widget.DelEditText
+                    android:id="@+id/edt_id_number"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@color/white"
+                    android:hint="@string/please_input_id_number"
+                    android:inputType="phone"
+                    android:paddingStart="@dimen/dp_18"
+                    android:text="@={vm.IDNumber}"
+                    android:textSize="@dimen/sp_13" />
+
+            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout >
+
+        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout >
+
+        <TextView
+            android:id="@+id/tv_tip"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/sp_12"
+            android:text="@string/personal_verify_tip"
+            android:textColor="#F17706"
+            android:textSize="@dimen/sp_12"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/lay_input" />
+
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+            android:id="@+id/btn_submmit"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_40"
+            android:layout_marginStart="@dimen/dp_30"
+            android:layout_marginEnd="@dimen/dp_30"
+            android:layout_marginBottom="@dimen/dp_30"
+            android:text="@string/submit"
+            app:layout_constraintBottom_toBottomOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout >
+
+</layout >

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

@@ -16,6 +16,7 @@
         android:paddingEnd="@dimen/dp_14" >
 
         <TextView
+            android:id="@+id/tv_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp_55"
@@ -23,11 +24,108 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <!--        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton-->
-        <!--            android:layout_width=""-->
-        <!--            android:layout_height=""-->
+        <com.qmuiteam.qmui.widget.QMUIRadiusImageView
+            android:id="@+id/img_id_man"
+            android:layout_width="146dp"
+            android:layout_height="96dp"
+            android:layout_marginTop="@dimen/dp_8"
+            android:scaleType="fitXY"
+            android:src="@drawable/ic_default_image"
+            app:layout_constraintStart_toStartOf="@id/tv_title"
+            app:layout_constraintTop_toBottomOf="@id/tv_title"
+            app:qmui_radius="1dp"
+            app:url="@{vm.imgIDMan}" />
+
+        <com.qmuiteam.qmui.widget.QMUIRadiusImageView
+            android:id="@+id/img_id_emblem"
+            android:layout_width="146dp"
+            android:layout_height="96dp"
+            android:scaleType="fitXY"
+            android:src="@drawable/ic_default_image"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@id/img_id_man"
+            app:qmui_radius="1dp"
+            app:url="@{vm.imgIDEmblem}" />
+
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+            android:id="@+id/lay_input"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_12"
+            android:gravity="center_vertical"
+            android:orientation="vertical"
+            android:paddingStart="@dimen/dp_8"
+            android:paddingEnd="@dimen/dp_14"
+            app:layout_constraintTop_toBottomOf="@id/img_id_man"
+            app:qmui_borderColor="#F4F3F9"
+            app:qmui_borderWidth="@dimen/dp_1"
+            app:rv_radius="25dp" >
+
+            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:gravity="center_vertical"
+                android:paddingStart="@dimen/dp_8"
+                android:paddingEnd="@dimen/dp_14" >
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/name" />
+
+                <com.ysnows.base.widget.DelEditText
+                    android:id="@+id/edt_name"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@color/white"
+                    android:hint="@string/name_must_equal_to_id_card"
+                    android:inputType="phone"
+                    android:paddingStart="@dimen/dp_18"
+                    android:text="@={vm.name}"
+                    android:textSize="@dimen/sp_13" />
+
+            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout >
+
+            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:gravity="center_vertical"
+                android:paddingStart="@dimen/dp_8"
+                android:paddingEnd="@dimen/dp_14" >
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/id_number" />
+
+                <com.ysnows.base.widget.DelEditText
+                    android:id="@+id/edt_id_number"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@color/white"
+                    android:hint="@string/please_input_id_number"
+                    android:inputType="phone"
+                    android:paddingStart="@dimen/dp_18"
+                    android:text="@={vm.IDNumber}"
+                    android:textSize="@dimen/sp_13" />
+
+            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout >
+
+        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout >
+
+        <TextView
+            android:id="@+id/tv_tip"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/sp_12"
+            android:text="@string/personal_verify_tip"
+            android:textColor="#F17706"
+            android:textSize="@dimen/sp_12"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/lay_input" />
 
         <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+            android:id="@+id/btn_submmit"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_40"
             android:layout_marginStart="@dimen/dp_30"

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

@@ -119,7 +119,7 @@
                         android:layout_height="26dp"
                         android:layout_marginTop="@dimen/dp_8"
                         android:layout_marginEnd="@dimen/dp_10"
-                        android:onClick="@{v->vm.goVerify()}"
+                        android:onClick="@{v->vm.user.isDriver()?vm.goVehicleVerify():vm.goComVerify()}"
                         android:text="@{vm.user.isDriver()?@string/vehicle_unverified:@string/com_unverified}"
                         android:textColor="#459AEA"
                         android:textSize="@dimen/sp_13"
@@ -171,6 +171,7 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
+                        android:onClick="@{v->vm.goCollection()}"
                         android:gravity="center"
 
                         android:orientation="vertical" >

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

@@ -0,0 +1,30 @@
+<?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" >
+
+    <data >
+
+    </data >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical" >
+
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+            android:id="@+id/refresh_layout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" >
+
+            <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_order" />
+
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout >
+    </LinearLayout >
+
+</layout >

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

@@ -1,16 +1,41 @@
 <?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" >
+<layout xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <data >
 
     </data >
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical" >
 
+        <FrameLayout
+            android:id="@+id/lay_container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" >
+
+            <com.qmuiteam.qmui.widget.tab.QMUITabSegment
+                android:id="@+id/tabs"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/title_bar_height"
+                android:background="@color/white"
+                android:textSize="12sp" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="8dp"
+                android:layout_marginTop="@dimen/title_bar_height"
+                android:background="@color/color_page" />
+
+            <com.qmuiteam.qmui.widget.QMUIViewPager
+                android:id="@+id/pager"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginTop="58dp" />
+
+        </FrameLayout >
+
+    </LinearLayout >
 
-    </androidx.constraintlayout.widget.ConstraintLayout >
 </layout >

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

@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools" >
+
+    <data >
+
+        <variable
+            name="item"
+            type="com.quansu.heifengwuliu.model.Vehicle" />
+
+    </data >
+
+    <RelativeLayout
+        android:id="@+id/rl_todo"
+        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" >
+
+        <ImageView
+            android:id="@+id/img_check"
+            android:layout_width="15dp"
+            android:layout_height="15dp"
+            android:layout_centerVertical="true"
+            android:padding="@dimen/dp_13"
+            android:src="@drawable/uncomplete" />
+
+        <ImageView
+            android:id="@+id/img_icon"
+            android:layout_width="45dp"
+            android:layout_height="45dp"
+            android:layout_centerVertical="true"
+            android:layout_toEndOf="@id/img_check"
+            android:padding="@dimen/dp_13"
+            android:src="@{item.checked==0?@drawable/uncomplete:@drawable/complete}"
+            tools:src="@mipmap/ic_launcher" />
+
+        <LinearLayout
+            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" >
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal" >
+
+                <TextView
+                    android:id="@+id/tv_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    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" />
+
+                <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.title}"
+                    android:textColor="@{item.checked==1?@color/text_hint:@color/text_black}"
+                    android:textSize="@dimen/sp_16"
+                    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.create_time}"
+                android:textColor="@{item.checked==1?@color/text_hint:@color/text_black}"
+                tools:text="@string/app_name" />
+
+        </LinearLayout >
+
+        <View
+            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" />
+    </RelativeLayout >
+</layout >

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

@@ -0,0 +1,155 @@
+<?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" >
+
+    <data >
+
+        <variable
+            name="item"
+            type="com.quansu.heifengwuliu.model.Order" />
+
+    </data >
+
+    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/dp_10"
+        android:orientation="vertical"
+        app:qmui_borderColor="@color/gray_lite"
+        app:qmui_borderWidth="@dimen/dp_1"
+        app:qmui_radius="@dimen/dp_5" >
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:paddingStart="@dimen/dp_10"
+            android:paddingEnd="@dimen/dp_10"
+            android:paddingBottom="@dimen/dp_5" >
+
+            <TextView
+                android:id="@+id/tv_number_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingTop="@dimen/dp_5"
+                android:paddingBottom="@dimen/dp_5"
+                android:text="@string/waybill_number"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/tv_number"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text=" YD20200901171059066"
+                app:layout_constraintBottom_toBottomOf="@id/tv_number_name"
+                app:layout_constraintStart_toEndOf="@id/tv_number_name"
+                app:layout_constraintTop_toTopOf="@id/tv_number_name" />
+
+            <TextView
+                android:id="@+id/tv_status"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="待接单(0/1)"
+                app:layout_constraintBottom_toBottomOf="@id/tv_number_name"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="@id/tv_number_name" />
+
+            <View
+                android:id="@+id/line"
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/gray_lite"
+                app:layout_constraintStart_toStartOf="@id/tv_number_name"
+                app:layout_constraintTop_toBottomOf="@id/tv_number_name" />
+
+            <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/guide_line"
+                android:layout_width="@dimen/dp_1"
+                android:layout_height="match_parent"
+                android:orientation="vertical"
+                app:layout_constraintGuide_percent="0.5" />
+
+            <ImageView
+                android:id="@+id/img_arrow"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:src="@drawable/ic_long_arrow"
+                app:layout_constraintEnd_toEndOf="@id/guide_line"
+                app:layout_constraintStart_toStartOf="@id/guide_line"
+                app:layout_constraintTop_toBottomOf="@id/line" />
+
+            <TextView
+                android:id="@+id/tv_from"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="@dimen/dp_10"
+                android:text="山东 临沂"
+                android:textColor="@color/blue"
+                app:layout_constraintBottom_toBottomOf="@id/img_arrow"
+                app:layout_constraintEnd_toStartOf="@id/img_arrow"
+                app:layout_constraintTop_toTopOf="@id/img_arrow" />
+
+            <TextView
+                android:id="@+id/tv_to"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_10"
+                android:text="北京 中关村"
+                android:textColor="@color/red_400"
+                app:layout_constraintBottom_toBottomOf="@id/img_arrow"
+                app:layout_constraintStart_toEndOf="@id/img_arrow"
+                app:layout_constraintTop_toTopOf="@id/img_arrow" />
+
+            <ImageView
+                android:id="@+id/img_vehicle"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:layout_marginTop="@dimen/dp_5"
+                android:src="@drawable/ic_vehicle"
+                app:layout_constraintStart_toStartOf="@id/tv_number_name"
+                app:layout_constraintTop_toBottomOf="@id/img_arrow" />
+
+            <TextView
+                android:id="@+id/tv_vehicle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_10"
+                android:text="平板货车 · 13米"
+                app:layout_constraintBottom_toBottomOf="@id/img_vehicle"
+                app:layout_constraintStart_toEndOf="@id/img_vehicle"
+                app:layout_constraintTop_toTopOf="@id/img_vehicle" />
+
+            <ImageView
+                android:id="@+id/img_goods"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:layout_marginTop="@dimen/dp_5"
+                android:padding="@dimen/dp_2"
+                android:src="@drawable/ic_goods"
+                app:layout_constraintStart_toStartOf="@id/img_vehicle"
+                app:layout_constraintTop_toBottomOf="@id/img_vehicle" />
+
+            <TextView
+                android:id="@+id/tv_goods"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_10"
+                android:text="苹果(农产品) · 35吨"
+                app:layout_constraintBottom_toBottomOf="@id/img_goods"
+                app:layout_constraintStart_toEndOf="@id/img_goods"
+                app:layout_constraintTop_toTopOf="@id/img_goods" />
+
+            <ImageView
+                android:id="@+id/img_qr"
+                android:layout_width="35dp"
+                android:layout_height="35dp"
+                android:src="@drawable/ic_qr"
+                app:layout_constraintBottom_toBottomOf="@id/img_goods"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="@id/img_vehicle" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout >
+
+    </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout >
+
+</layout >

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

@@ -323,7 +323,7 @@ Api 已达到使用限制
     <string name="abc_font_family_menu_material" >sans-serif</string >
     <string name="abc_font_family_subhead_material" >sans-serif</string >
     <string name="abc_font_family_title_material" >sans-serif-medium</string >
-    <string name="appbar_scrolling_view_behavior" translatable="false">com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior</string>
+    <string name="appbar_scrolling_view_behavior" translatable="false" >com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior</string >
 
     <!--    <string name="appbar_scrolling_view_behavior" >android.support.design.widget.AppBarLayout$ScrollingViewBehavior</string >-->
     <string name="bottom_sheet_behavior" >android.support.design.widget.BottomSheetBehavior</string >
@@ -404,11 +404,11 @@ Api 已达到使用限制
     <string name="buy_vip_success" >购买会员成功</string >
     <string name="developing" >此功能正在开放中...</string >
     <string name="go_go_go" >立即进入</string >
-<!--    -->
-    <string name="home">货源</string>
-    <string name="waybill">我的运单</string>
-    <string name="my">个人中心</string>
-    <string name="your_status">您的身份</string>
+    <!--    -->
+    <string name="home" >货源</string >
+    <string name="waybill" >我的运单</string >
+    <string name="my" >个人中心</string >
+    <string name="your_status" >您的身份</string >
     <string name="invoice_manage" >发票管理</string >
     <string name="my_account" >我的账户</string >
     <string name="my_collection" >我的收藏</string >
@@ -426,5 +426,23 @@ Api 已达到使用限制
     <string name="com_unverified" >公司未认证</string >
     <string name="vehicle_unverified" >车辆未认证</string >
     <string name="id_information_upload" >身份证信息上传</string >
+    <string name="name_must_equal_to_id_card" >姓名需与身份证姓名一致</string >
+    <string name="name" >姓名</string >
+    <string name="id_number" >身份证号</string >
+    <string name="please_input_id_number" >请输入身份证号码</string >
+    <string name="personal_verify_tip" >* 此信息只作为审核使用,平台不会泄露信息给第三方,审 核通过后即可发货</string >
+    <string name="identity_verify" >身份认证</string >
+    <string name="com_verify" >公司认证</string >
+    <string name="bl_upload" >营业执照上传</string >
+    <string name="add_vehicle" >添加车辆</string >
+    <string name="all_select" >全选</string >
+    <string name="all" >全部</string >
+    <string name="to_order_receive" >待接单</string >
+    <string name="on_going" >进行中</string >
+    <string name="canceled" >已取消</string >
+    <string name="completed" >已完成</string >
+    <string name="waybill_number" >运单号: </string >
+    <string name="source_information" >货源信息</string >
+    <string name="filter" >筛选</string >
 
 </resources >

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

@@ -285,6 +285,11 @@ abstract class BActivity<VM : BViewModel<*>, B : ViewDataBinding> : RxAppCompatA
         return R.color.white
     }
 
+    @ColorRes
+    override fun rightTextColor(): Int {
+        return R.color.white
+    }
+
     override fun titleSize(): Int {
         return 17
     }

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

@@ -252,6 +252,11 @@ abstract class BFragment<VM : BViewModel<*>, B : ViewDataBinding> : RxFragment()
         return R.color.white
     }
 
+    @ColorRes
+    override fun rightTextColor(): Int {
+        return R.color.white
+    }
+
     override fun titleSize(): Int {
         return 17
     }

base/src/main/java/com/ysnows/base/widget/TitleBar.kt

@@ -83,8 +83,11 @@ class TitleBar : RelativeLayout {
         } else {
             tvTitle?.text = dataSource.title()
         }
-        val textColor = tvTitle?.setTextColor(getContext().resources.getColor(dataSource!!.titleColor()))
+
+        tvTitle?.setTextColor(ResourcesCompat.getColor(getContext().resources, dataSource.titleColor(), null))
         tvTitle?.textSize = dataSource.titleSize().toFloat()
+        tvRight?.setTextColor(ResourcesCompat.getColor(getContext().resources, dataSource.rightTextColor(), null))
+
         if (!TextUtils.isEmpty(rightText)) {
             setRightText(rightText)
         }
@@ -92,6 +95,7 @@ class TitleBar : RelativeLayout {
             setLeftText(leftText)
         }
         rightDrawable?.let { setRitghtImg(it) }
+
         rightLeftDrawable?.let { setRitghtLeftImg(it) }
         imgLeft?.setOnClickListener(OnClickListener { v: View? ->
             if (getContext() is Activity) {
@@ -100,8 +104,11 @@ class TitleBar : RelativeLayout {
                 }
             }
         })
+
         setBackgroundColor(ResourcesCompat.getColor(resources, dataSource.bgColor(), null))
         setLeftImg(ResourcesCompat.getDrawable(resources, dataSource.backDrawable(), null))
+
+
         typedArray.recycle()
     }
 
@@ -200,6 +207,9 @@ class TitleBar : RelativeLayout {
         @ColorRes
         fun titleColor(): Int
 
+        @ColorRes
+        fun rightTextColor(): Int
+
         fun titleSize(): Int
         fun transluent(): Boolean