1.接单车辆列表。

app/src/main/AndroidManifest.xml

@@ -92,6 +92,7 @@
         <activity android:name=".activity.InvoiceActivity"/>
         <activity android:name=".activity.PasswordActivity"/>
         <activity android:name=".activity.InvoiceTitleActivity"/>
+        <activity android:name=".activity.VehicleListActivity"/>
 
 
     </application >

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

@@ -25,7 +25,7 @@ class AccountActivity : MBTabActivity<BViewModel<BRepository>, ActivityAccountBi
 
     override fun getPageItem(position: Int): Fragment {
         return if (position == 1) {
-            AccountAnalysisFragment()
+           AccountAnalysisFragment()
         } else AccountBillFragment()
     }
 
@@ -44,4 +44,4 @@ class AccountActivity : MBTabActivity<BViewModel<BRepository>, ActivityAccountBi
 
         return arrayOf(component, util)
     }
-}
+}

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

@@ -8,9 +8,9 @@ import com.quansu.heifengwuliu.base.MBRActivity
 import com.quansu.heifengwuliu.databinding.ActivityCollectionBinding
 import com.quansu.heifengwuliu.model.DriverBean
 import com.quansu.heifengwuliu.model.SaveDriverBean
-import com.quansu.heifengwuliu.vmodel.AllCarVModel
+import com.quansu.heifengwuliu.vmodel.CollectionVModel
 
-class AllCarActivity : MBRActivity<AllCarVModel, CollectionAdapter, ActivityCollectionBinding>() {
+class AllCarActivity : MBRActivity<CollectionVModel, CollectionAdapter, ActivityCollectionBinding>() {
 
 
     override fun initView(view: View?) {
@@ -58,7 +58,7 @@ class AllCarActivity : MBRActivity<AllCarVModel, CollectionAdapter, ActivityColl
         return getString(R.string.add_vehicle)
     }
 
-    override fun vmClass(): Class<AllCarVModel> {
-        return AllCarVModel::class.java
+    override fun vmClass(): Class<CollectionVModel> {
+        return CollectionVModel::class.java
     }
 }

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

@@ -33,13 +33,11 @@ class SourceDetailsActivity: MBActivity<SourceDetailsVModel, ActivitySourcedetai
             vm.getInfo(info_id!!)
         }
 
-        if(type=="1"){//todo：暂时
-            binding.butComeback.visibility= View.GONE
-        }
+
         vm.info.observe(this, Observer {
             //观察
             initViewPager(vm.info.value!!)
-            if(vm.info.value!!.order.is_pay=="0") {//未支付
+            if(vm.info.value!!.order.info_state==10) {//弹支付框
                 vm.showPayDialog(info_id!!, binding.ll)
             }
 

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

@@ -0,0 +1,29 @@
+package com.quansu.heifengwuliu.activity
+
+import com.quansu.heifengwuliu.adapter.VehicleListAdapter
+import com.quansu.heifengwuliu.base.MBRActivity
+import com.quansu.heifengwuliu.databinding.ActivityVehiclelistBinding
+import com.quansu.heifengwuliu.vmodel.VehicleListVModel
+
+/**
+ *Created by shihuiyun
+ *on 2020/9/18
+ */
+class VehicleListActivity : MBRActivity<VehicleListVModel, VehicleListAdapter, ActivityVehiclelistBinding>(){
+
+
+    override fun vmClass(): Class<VehicleListVModel> {
+        return VehicleListVModel::class.java
+    }
+    override fun binding(): ActivityVehiclelistBinding {
+        return ActivityVehiclelistBinding.inflate(layoutInflater)
+    }
+
+    override fun initAdapter(): VehicleListAdapter {
+        return VehicleListAdapter()
+    }
+
+    override fun title(): String? {
+        return "接单车辆"
+    }
+}

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

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

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

@@ -8,6 +8,8 @@ import com.ysnows.base.base.BRepository
 import com.ysnows.base.base.BViewModel
 
 class AccountAnalysisFragment : MBFragment<BViewModel<BRepository>, FragmentAccountAnalysisBinding>() {
+
+
     override fun binding(inflater: LayoutInflater, container: ViewGroup?): FragmentAccountAnalysisBinding {
         return FragmentAccountAnalysisBinding.inflate(inflater, container, false)
     }
@@ -17,4 +19,4 @@ class AccountAnalysisFragment : MBFragment<BViewModel<BRepository>, FragmentAcco
         return null
     }
 
-}
+}

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

@@ -5,13 +5,9 @@ import android.view.ViewGroup
 import com.quansu.heifengwuliu.adapter.BillAdapter
 import com.quansu.heifengwuliu.base.MBRFragment
 import com.quansu.heifengwuliu.databinding.FragmentAccountBillBinding
-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
+import com.quansu.heifengwuliu.vmodel.AccountBillVModel
 
-class AccountBillFragment : MBRFragment<BRViewModel<BRRepository>, BillAdapter, FragmentAccountBillBinding>() {
+class AccountBillFragment : MBRFragment<AccountBillVModel, BillAdapter, FragmentAccountBillBinding>() {
 
     override fun initAdapter(): BillAdapter {
         return BillAdapter()
@@ -24,4 +20,8 @@ class AccountBillFragment : MBRFragment<BRViewModel<BRRepository>, BillAdapter,
     override fun title(): String? {
         return null
     }
-}
+
+    override fun vmClass(): Class<AccountBillVModel> {
+        return AccountBillVModel::class.java
+    }
+}

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

@@ -0,0 +1,18 @@
+package com.quansu.heifengwuliu.vmodel
+
+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
+
+/**
+ *Created by shihuiyun
+ *on 2020/9/18
+ */
+ class AccountBillVModel : BRViewModel<BRRepository>() {
+
+    override fun api(): Observable<out IResponse<*>> {
+        return NetEngine.service.taskList("",  repository().autoPage())
+    }
+}

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

@@ -2,16 +2,13 @@ package com.quansu.heifengwuliu.vmodel
 
 import android.app.Activity
 import android.content.Intent
-import androidx.databinding.Bindable
-import com.quansu.heifengwuliu.BR
 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 CollectionVModel : SearchVModel() {
 
+
     fun setSaveDriver(arr: String) {
         //添加司机
 
@@ -28,6 +25,8 @@ class CollectionVModel : SearchVModel() {
                 .subscribe()
     }
 
+
+
     override fun api(): Observable<out IResponse<*>> {
         return NetEngine.service.myDriver(k, repository().autoPage())
     }

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

@@ -2,6 +2,7 @@ package com.quansu.heifengwuliu.vmodel
 
 import android.app.Activity
 import android.content.Context
+import android.os.Bundle
 import android.text.TextUtils
 import android.view.LayoutInflater
 import android.widget.FrameLayout
@@ -16,11 +17,13 @@ import com.qmuiteam.qmui.widget.popup.QMUIPopup
 import com.qmuiteam.qmui.widget.popup.QMUIPopups
 import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
 import com.quansu.heifengwuliu.R
+import com.quansu.heifengwuliu.activity.VehicleListActivity
 import com.quansu.heifengwuliu.model.DataInfoBean
 import com.quansu.heifengwuliu.utils.net.NetEngine
 import com.quansu.heifengwuliu.view.PasswordView
 import com.ysnows.base.base.BRepository
 import com.ysnows.base.base.BViewModel
+import com.ysnows.base.utils.UiSwitch
 
 
 open class SourceDetailsVModel : BViewModel<BRepository>() {
@@ -135,5 +138,13 @@ open class SourceDetailsVModel : BViewModel<BRepository>() {
         con.finish()
     }
 
+    fun goDriverList(){
+        //接单车辆 todo
+        UiSwitch.bundle(repository().context, VehicleListActivity::class.java, Bundle().apply {
+            putInt("type",1)
+        })
+
+    }
+
 
 }

app/src/main/java/com/quansu/heifengwuliu/vmodel/AllCarVModel.kt → app/src/main/java/com/quansu/heifengwuliu/vmodel/VehicleListVModel.kt

@@ -2,15 +2,12 @@ package com.quansu.heifengwuliu.vmodel
 
 import android.app.Activity
 import android.content.Intent
-import androidx.databinding.Bindable
-import com.quansu.heifengwuliu.BR
 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 AllCarVModel : SearchVModel() {
+class VehicleListVModel : SearchVModel() {
+
 
     fun setSaveDriver(arr: String) {
         //添加司机
@@ -28,8 +25,10 @@ class AllCarVModel : SearchVModel() {
                 .subscribe()
     }
 
+
+
     override fun api(): Observable<out IResponse<*>> {
-        return NetEngine.service.allDriver(k, repository().autoPage())
+        return NetEngine.service.myDriver(k, repository().autoPage())
     }
 
 

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

@@ -332,6 +332,23 @@
 
             </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton>
 
+            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+                android:id="@+id/but_driver"
+                android:layout_width="120dp"
+                android:layout_height="@dimen/dp_40"
+                android:layout_marginStart="@dimen/dp_15"
+                android:text="接单车辆"
+                android:onClick="@{v->vm.goDriverList()}"
+                android:visibility="@{vm.info.order.info_state==30||vm.info.order.info_state==40? View.VISIBLE :View.GONE}"
+                android:textColor="@color/text_title"
+                app:qmui_borderColor="@color/color_line"
+                app:qmui_radius="@dimen/dp_4">
+
+            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton>
+
+
+
+
 
         </LinearLayout>
 

app/src/main/res/layout/activity_vehiclelist.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 >
+
+        <variable
+            name="vm"
+            type="com.quansu.heifengwuliu.vmodel.VehicleListVModel" />
+    </data >
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical" >
+
+        <com.quansu.heifengwuliu.widget.SearchView
+            android:id="@+id/search"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:vm="@{vm}" />
+
+
+
+            <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_vehiclelist" />
+
+            </androidx.swiperefreshlayout.widget.SwipeRefreshLayout >
+
+
+
+
+    </LinearLayout >
+
+</layout >

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

@@ -0,0 +1,145 @@
+<?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.DriverBean" />
+
+    </data>
+
+    <LinearLayout xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/rl_todo"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/dp_12"
+        android:layout_marginEnd="@dimen/dp_12"
+        android:layout_marginBottom="@dimen/dp_10"
+        android:orientation="vertical">
+
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="@dimen/dp_10"
+            app:qmui_borderColor="#BBBBBB"
+            app:qmui_borderWidth="@dimen/dp_1"
+            app:qmui_radius="@dimen/dp_4">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:ellipsize="end"
+                    android:maxLines="1"
+                    android:text="@{item.sj_uid}"
+                    android:textColor="@color/text_title"
+                    android:textSize="@dimen/sp_16"
+                    tools:text="@string/app_name" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:ellipsize="end"
+                    android:maxLines="1"
+                    android:textColor="#67ACEE"
+                    android:textSize="@dimen/sp_16"
+                    tools:text="@string/app_name" />
+
+            </LinearLayout>
+
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:orientation="vertical">
+
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/dp_10"
+                        android:orientation="horizontal">
+
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="车牌号："
+                            android:textColor="@color/text_title"
+                            android:textSize="@dimen/sp_16"
+                            tools:text="@string/app_name" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="@dimen/dp_10"
+                            android:text="鲁Q5u1u5"
+                            android:textColor="@color/text_title"
+                            android:textSize="@dimen/sp_16"
+                            tools:text="@string/app_name" />
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/dp_10"
+                        android:orientation="horizontal">
+
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="张三"
+                            android:textColor="@color/text_title"
+                            android:textSize="@dimen/sp_16"
+                            tools:text="@string/app_name" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="@dimen/dp_10"
+                            android:text="18353965350"
+                            android:textColor="@color/text_title"
+                            android:textSize="@dimen/sp_16"
+                            tools:text="@string/app_name" />
+
+                    </LinearLayout>
+                </LinearLayout>
+
+                <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+                    android:layout_width="120dp"
+                    android:layout_height="40dp"
+                    android:text="去结算"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/sp_15"
+                    app:qmui_backgroundColor="#E17E30"
+                    app:qmui_borderColor="#E17E30"
+                    app:qmui_radius="@dimen/dp_4" />
+
+
+            </LinearLayout>
+
+
+        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+
+    </LinearLayout>
+</layout>