1.接单车辆列表。

app/src/main/AndroidManifest.xml

@@ -87,6 +87,7 @@
         <activity android:name=".activity.AddressAddActivity"/>
         <activity android:name=".activity.AreaSelectActivity"/>
         <activity android:name=".activity.SourceDetailsActivity"/>
+        <activity android:name=".activity.WaybillDetailsActivity"/>
         <activity android:name=".activity.AllCarActivity"/>
         <activity android:name=".activity.InvoiceActivity"/>
         <activity android:name=".activity.PasswordActivity"/>

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

@@ -1,39 +1,25 @@
 package com.quansu.heifengwuliu.activity
 
-import android.app.Activity
-import android.content.Intent
 import android.os.Bundle
 import android.text.TextUtils
 import androidx.lifecycle.Observer
-import com.luck.picture.lib.PictureSelector
 import com.quansu.heifengwuliu.adapter.OrderInfoInadapter
 import com.quansu.heifengwuliu.adapter.OrderInfoadapter
 import com.quansu.heifengwuliu.base.MBActivity
-import com.quansu.heifengwuliu.config.MIntentAction
 import com.quansu.heifengwuliu.databinding.ActivitySourcedetailsBinding
-import com.quansu.heifengwuliu.inte.OnUploadCallback
 import com.quansu.heifengwuliu.model.DataInfoBean
-import com.quansu.heifengwuliu.utils.OssUtils
 import com.quansu.heifengwuliu.vmodel.SourceDetailsVModel
-import java.util.ArrayList
-
 
 /**
+ * 货主-货源详情
  *Created by shihuiyun
  *on 2020/9/15
  */
-class SourceDetailsActivity: MBActivity<SourceDetailsVModel, ActivitySourcedetailsBinding>(), OnUploadCallback<String> {
-    var type=1//0运单详情-货主端（显示运输轨迹按钮，下一步按钮） 1 货源详情-货主端（取消发布 再来一单 接单车辆）  2运单详情-司机端
-
-    override fun __before() {
-        super.__before()
-         type= intent?.extras?.getInt("type", 1)!!
+class SourceDetailsActivity: MBActivity<SourceDetailsVModel, ActivitySourcedetailsBinding>(){
 
-    }
 
     override fun initCreate(savedInstanceState: Bundle?) {
         super.initCreate(savedInstanceState)
-        vm.type.value=type
         vm.again= intent?.extras?.getInt("again", 0)!!
 
         var info_id=intent?.extras?.getString("info_id", "")
@@ -46,7 +32,7 @@ class SourceDetailsActivity: MBActivity<SourceDetailsVModel, ActivitySourcedetai
         vm.info.observe(this, Observer {
             //观察
             initViewPager(vm.info.value!!)
-            if(vm.info.value!!.order.info_state==10&&type!=2) {//弹支付框
+            if(vm.info.value!!.order.info_state==10) {//弹支付框
                 vm.showPayDialog(info_id!!, binding.ll)
             }
 
@@ -76,60 +62,14 @@ class SourceDetailsActivity: MBActivity<SourceDetailsVModel, ActivitySourcedetai
 
 
     override fun title(): String? {
-        return if(type==1) "货源详情" else "运单详情"
+
+        return "货源详情"
     }
 
     override fun vmClass(): Class<SourceDetailsVModel> {
         return SourceDetailsVModel::class.java
     }
 
-    override val isRxbus: Boolean
-        get() = true
-
-    override fun onUploadSuccess(t: String) {
-        val ss: Array<String> = t.split(",".toRegex()).toTypedArray()
-        vm.img.value=ss[1]
-
-    }
-
-    override fun onUploadError(error: String?) {
-        TODO("Not yet implemented")
-    }
-
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        super.onActivityResult(requestCode, resultCode, data)
-        if (resultCode != Activity.RESULT_OK) {
-            return
-        }
-        if (requestCode == MIntentAction.REQUEST_CODE_THREE) {//图片
-
-            val selectList = PictureSelector.obtainMultipleResult(data)
-            val list = ArrayList<String>()
-            if (null != selectList) {
-                for (path in selectList) {
-                    list.add(path.path)
-                }
-
-                OssUtils(this)
-                        .setUpLoad("order", list, this)
-
-            }
-
-            return
-
-        }
-        if (requestCode == MIntentAction.REQUEST_CODE_CAMERA) {//拍照
-            //拍照
-            val selectList = PictureSelector.obtainMultipleResult(data) ?: return
-            val list = ArrayList<String>()
-            list.add(selectList[0].path)
-            OssUtils(this)
-                    .setUpLoad("order", list, this)
-
-            return
-        }
-
-    }
 
 
 

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

@@ -1,5 +1,6 @@
 package com.quansu.heifengwuliu.activity
 
+import android.os.Bundle
 import com.quansu.heifengwuliu.adapter.VehicleListAdapter
 import com.quansu.heifengwuliu.base.MBRActivity
 import com.quansu.heifengwuliu.databinding.ActivityVehiclelistBinding
@@ -12,6 +13,15 @@ import com.quansu.heifengwuliu.vmodel.VehicleListVModel
 class VehicleListActivity : MBRActivity<VehicleListVModel, VehicleListAdapter, ActivityVehiclelistBinding>(){
 
 
+
+    override fun initCreate(savedInstanceState: Bundle?) {
+        super.initCreate(savedInstanceState)
+        var info_id=intent?.extras?.getString("info_id", "")
+        vm.info_id.value=info_id
+
+    }
+
+
     override fun vmClass(): Class<VehicleListVModel> {
         return VehicleListVModel::class.java
     }
@@ -20,7 +30,7 @@ class VehicleListActivity : MBRActivity<VehicleListVModel, VehicleListAdapter, A
     }
 
     override fun initAdapter(): VehicleListAdapter {
-        return VehicleListAdapter()
+        return VehicleListAdapter(vm)
     }
 
     override fun title(): String? {

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

@@ -0,0 +1,120 @@
+package com.quansu.heifengwuliu.activity
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Bundle
+import androidx.lifecycle.Observer
+import com.luck.picture.lib.PictureSelector
+import com.quansu.heifengwuliu.adapter.OrderInfoInadapter
+import com.quansu.heifengwuliu.adapter.OrderInfoadapter
+import com.quansu.heifengwuliu.base.MBActivity
+import com.quansu.heifengwuliu.config.MIntentAction
+import com.quansu.heifengwuliu.databinding.ActivityWaybilldetailsBinding
+import com.quansu.heifengwuliu.inte.OnUploadCallback
+import com.quansu.heifengwuliu.model.WaybillDetails
+import com.quansu.heifengwuliu.utils.OssUtils
+import com.quansu.heifengwuliu.vmodel.WaybillDetailsVModel
+import java.util.ArrayList
+
+/**
+ * 司机/货主 运单详情
+ *Created by shihuiyun
+ *on 2020/9/24
+ */
+class WaybillDetailsActivity : MBActivity<WaybillDetailsVModel, ActivityWaybilldetailsBinding>(), OnUploadCallback<String> {
+    var type = 0//0 运单详情-货主端）  2 运单详情-司机端
+
+    override fun __before() {
+        super.__before()
+        type = intent?.extras?.getInt("type", 0)!!
+
+    }
+
+    override fun initCreate(savedInstanceState: Bundle?) {
+        super.initCreate(savedInstanceState)
+        vm.type.value=type
+        var order_id = intent?.extras?.getString("order_id", "")
+
+        vm.getInfo(order_id!!)
+
+        vm.info.observe(this, Observer {
+            //观察
+            initViewPager(vm.info.value!!)
+
+        })
+
+
+    }
+
+    private fun initViewPager(bean: WaybillDetails){
+        var  adapterOut= OrderInfoadapter()
+        binding.recyclerViewOut.adapter=adapterOut
+        var  outList = bean.info.send
+        adapterOut!!.addData(outList)
+        //入
+        var adapterIn= OrderInfoInadapter()
+        binding.recyclerViewIn.adapter=adapterIn
+        var  inList = bean.info.receive
+        adapterIn!!.addData(inList)
+
+    }
+
+    override fun binding(): ActivityWaybilldetailsBinding {
+        return ActivityWaybilldetailsBinding.inflate(layoutInflater)
+    }
+
+    override fun vmClass(): Class<WaybillDetailsVModel> {
+        return WaybillDetailsVModel::class.java
+    }
+
+    override fun title(): String? {
+        return "运单详情"
+    }
+
+    override fun onUploadSuccess(t: String) {
+        val ss: Array<String> = t.split(",".toRegex()).toTypedArray()
+        vm.img.value=ss[1]
+
+    }
+
+    override fun onUploadError(error: String?) {
+        TODO("Not yet implemented")
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        if (resultCode != Activity.RESULT_OK) {
+            return
+        }
+        if (requestCode == MIntentAction.REQUEST_CODE_THREE) {//图片
+
+            val selectList = PictureSelector.obtainMultipleResult(data)
+            val list = ArrayList<String>()
+            if (null != selectList) {
+                for (path in selectList) {
+                    list.add(path.path)
+                }
+
+                OssUtils(this)
+                        .setUpLoad("order", list, this)
+
+            }
+
+            return
+
+        }
+        if (requestCode == MIntentAction.REQUEST_CODE_CAMERA) {//拍照
+            //拍照
+            val selectList = PictureSelector.obtainMultipleResult(data) ?: return
+            val list = ArrayList<String>()
+            list.add(selectList[0].path)
+            OssUtils(this)
+                    .setUpLoad("order", list, this)
+
+            return
+        }
+
+    }
+
+
+}

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

@@ -4,10 +4,12 @@ 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.quansu.heifengwuliu.vmodel.VehicleListVModel
 import com.ysnows.base.base.BAdapter
 
-class VehicleListAdapter() : BAdapter<DriverBean, BaseDataBindingHolder<ItemVehiclelistBinding>>(R.layout.item_vehiclelist) {
+class VehicleListAdapter(var vm: VehicleListVModel) : BAdapter<DriverBean, BaseDataBindingHolder<ItemVehiclelistBinding>>(R.layout.item_vehiclelist) {
     override fun convert(holder: BaseDataBindingHolder<ItemVehiclelistBinding>, item: DriverBean) {
+        holder.dataBinding?.vm=vm
         holder.dataBinding?.item = item
 
     }

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

@@ -258,32 +258,36 @@ class OwnerSingleFragment : MBFragment<OwnerSingleVModel, FragmentOwnersingleBin
             return
         }
 
-        if (TextUtils.isEmpty(vm.goodstype.value.toString())) {
+        if (TextUtils.isEmpty(vm.goodstype.value)) {
             toast("请选择货物类型")
             return
         }
-        if (TextUtils.isEmpty(vm.unit.value.toString())) {
+        if (TextUtils.isEmpty(vm.unit.value)) {
             toast("请选择单车运量单位")
             return
         }
 
         var nums = binding.etSingCarNums.text.toString().trim()
 
-        if (TextUtils.isEmpty(vm.unit.value.toString())) {
+        if (TextUtils.isEmpty(vm.unit.value)) {
             toast("请输入单车运量数量")
             return
         }
         var price = binding.etSingCarPrice.text.toString().trim()
         var total = binding.etSingCarTotal.text.toString().trim()
-        if (TextUtils.isEmpty(vm.unit.value.toString())) {
+        if (TextUtils.isEmpty(total)) {
             toast("请输入总金额")
             return
         }
 
+        if(total.toDouble()==0.00){
+            toast("总金额要大于0")
+            return
+        }
         var address_in = binding.viewEnter.getEtDetailedAddress()!!.text.toString().trim()
 
         var receiveBean = ReceiveBean(lat_in, lng_in, province_in, city_in, area_in, address_in, name_in, mobile_in, time_in, "1",
-                goods_name, goods_type_code, nums, vm.unit.value.toString(), price, total,"",""
+                goods_name, goods_type_code, nums, vm.unit.value!!, price, total,"",""
         )
 
         if (is_agree==0) {

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

@@ -1,6 +1,5 @@
 package com.quansu.heifengwuliu.model
 
-import com.google.gson.annotations.SerializedName
 import com.ysnows.base.inter.IModel
 
 /**
@@ -57,7 +56,7 @@ data class DataInfoBean(var goods_type: List<SelectData>, var nums_type: List<St
                          var create_time: String, var update_time: String,
                          var delete_time: String, var send: List<SendBean>,
                          var receive: List<ReceiveBean>,
-                         var type_info: TypeInfoBean) : IModel {
+                         var type_info: TypeInfoBean,var car_nums:String) : IModel {
 
 
         data class TypeInfoBean(var type_id: String, var type_name: String,  var length: String,

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

@@ -12,5 +12,5 @@ import com.ysnows.base.inter.IModel
 class DriverBean(  val sj_uid:String,val uid: String?, val avatar: String?,
                   val name: String?, val mobile: String?, val car_id: String?,
                   val number: String?, val car_cate: String?,val driver_id: String?,
-                  var checked: Int = 0): IModel {
+                  var checked: Int = 0,val create_time:String,val order_id:String,val order_state:Int): IModel {
 }

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

@@ -21,7 +21,7 @@ data class InfoListBean(var info_id: String, var info_state: Int,
                         var delete_time: String, var qrcode:String,
                         var send: List<SendBean>,
                         var receive: List<ReceiveBean>,var type_info:TypeInfoBean,
-                        var company_name:String,var order_state:Int
+                        var company_name:String,var order_state:Int,var order_id:String
 ) : IModel {
 
     data class TypeInfoBean(var type_id: String,var type_name: String,  var length: String,

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

@@ -0,0 +1,22 @@
+package com.quansu.heifengwuliu.model
+
+import com.ysnows.base.inter.IModel
+
+/**
+ *Created by shihuiyun
+ *on 2020/9/24
+ */
+data class WaybillDetails(var order: OrderBean,var info:DataInfoBean.OrderBean,var driver:DriverBean): IModel {
+
+
+
+
+    data class OrderBean(var order_id: String, var order_sn: String,var order_state: Int, var uid: String,
+                         var info_id: String, var info_uid: String,var money: String, var t_img: String,
+                         var nat_numsme: String, var zf_time: String,var pj_time: String, var create_time: String):IModel{
+
+    }
+
+    data class DriverBean(var uid: String,var name: String, var avatar: String,
+                          var mobile: String, var number: String, var is_collect: Int):IModel{}
+}

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

@@ -191,13 +191,23 @@ interface ApiService {
     fun setAddressDel(@Query("addr_id") addr_id: String?): Observable<Response<Any>>
 
     /**
-     * 获取详情-货主端
+     * 货源详情-货主端
      * @return
      */
     @GET("api/info/infoGet")
     fun infoGet(@Query("info_id") info_id: String?): Observable<Response<DataInfoBean>>
 
 
+
+    /**
+     * 运单详情-货主端
+     * @return
+     */
+    @GET("api/info/orderGet")
+    fun orderGet(@Query("order_id") order_id: String?): Observable<Response<WaybillDetails>>
+
+
+
     /**
      * 添加编辑信息-货源管理
      * @return
@@ -385,13 +395,21 @@ interface ApiService {
 
 
     /**
-     * 获取详情-司机端
+     * 货源详情-司机端
      * @return
      */
     @GET("api/order/infoGet")
     fun infoGetDriver(@Query("info_id") info_id: String?): Observable<Response<DataInfoBean>>
 
 
+    /**
+     * 运单详情-司机端
+     * @return
+     */
+    @GET("api/info/orderGet")
+    fun orderGetDriver(@Query("order_id") order_id: String?): Observable<Response<WaybillDetails>>
+
+
 
     /**
      * 抢单-司机端
@@ -514,4 +532,14 @@ interface ApiService {
     ): Observable<Response<Any>>
 
 
+    /**
+     * 接单车辆-货主端
+     * @return
+     */
+    @GET("api/info/carList")
+    fun carList(@Query("info_id") info_id: String?, @Query("p") p: Int): Observable<Response<List<DriverBean>>>
+
+
+
+
 }

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

@@ -2,6 +2,7 @@ package com.quansu.heifengwuliu.vmodel
 
 import android.os.Bundle
 import com.quansu.heifengwuliu.activity.SourceDetailsActivity
+import com.quansu.heifengwuliu.activity.WaybillDetailsActivity
 import com.quansu.heifengwuliu.config.MIntentAction
 import com.quansu.heifengwuliu.fragment.DriverOrderListFragment
 import com.quansu.heifengwuliu.utils.net.NetEngine
@@ -32,15 +33,13 @@ class DriverOrderListVModel : BRViewModel<BRRepository>() {
 
     }
 
-    fun gotoInfoDetails(info_id: String) {
+    fun gotoInfoDetails(order_id: String) {
         //到详情界面
-        UiSwitch.bundleRes(fragment, SourceDetailsActivity::class.java, Bundle().apply {
-            putString("info_id", info_id)
+        UiSwitch.bundleRes(fragment, WaybillDetailsActivity::class.java, Bundle().apply {
+            putString("order_id", order_id)
             putInt("type", 2)
-            putInt("again", 0)
         },MIntentAction.REQUEST_CODE_ONE)
 
-
     }
 
     override fun api(): Observable<out IResponse<*>> {

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

@@ -33,7 +33,6 @@ class OrderListVModel : BRViewModel<BRRepository>() {
         //到详情界面
         UiSwitch.bundle(repository().context, SourceDetailsActivity::class.java, Bundle().apply {
             putString("info_id", info_id)
-            putInt("type", 1)
             putInt("again", 1)
         })
 

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

@@ -78,11 +78,10 @@ open class OwnerMoreVModel : BViewModel<BRepository>() {
         repository().lreq(NetEngine.service.infoEdit(info_id,type_id,total,driver,nums,is_public,is_insurance,type,
         data,send,receive))
                 .doOnNext() {
-                    if (it.ok()) {
+                    if (it.ok(true)) {
                         var  bean=it.data() as InfoEditBean
                         UiSwitch.bundle(repository().context, SourceDetailsActivity::class.java, Bundle().apply {
                             putString("info_id", bean.info_id)
-                            putInt("type",1)
                             putInt("again", 0)
                         })
 

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

@@ -81,11 +81,10 @@ open class OwnerSingleVModel : BViewModel<BRepository>() {
         repository().lreq(NetEngine.service.infoEdit(info_id,type_id,total,driver,nums,is_public,is_insurance,type,
         data,send,receive))
                 .doOnNext() {
-                    if (it.ok()) {
+                    if (it.ok(true)) {
                         var  bean=it.data() as InfoEditBean
                         UiSwitch.bundle(repository().context, SourceDetailsActivity::class.java, Bundle().apply {
                             putString("info_id", bean.info_id)
-                            putInt("type",1)
                             putInt("again", 0)
                         })
 

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

@@ -8,7 +8,6 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import android.text.TextUtils
-import android.util.Log
 import android.view.LayoutInflater
 import android.widget.FrameLayout
 import android.widget.ImageView
@@ -19,22 +18,15 @@ import androidx.lifecycle.MutableLiveData
 import com.google.gson.Gson
 import com.hwangjr.rxbus.RxBus
 import com.qmuiteam.qmui.layout.QMUIFrameLayout
-import com.qmuiteam.qmui.skin.QMUISkinHelper
 import com.qmuiteam.qmui.skin.QMUISkinValueBuilder
 import com.qmuiteam.qmui.util.QMUIDisplayHelper
-import com.qmuiteam.qmui.util.QMUIResHelper
-import com.qmuiteam.qmui.widget.dialog.QMUIDialog
-import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction
 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.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
-import com.quansu.heifengwuliu.utils.ChosePhotoUtils
 import com.quansu.heifengwuliu.utils.net.NetEngine
 import com.quansu.heifengwuliu.view.PasswordView
 import com.yanzhenjie.permission.Action
@@ -42,26 +34,17 @@ import com.yanzhenjie.permission.AndPermission
 import com.ysnows.base.base.BRepository
 import com.ysnows.base.base.BViewModel
 import com.ysnows.base.utils.UiSwitch
-import java.util.HashMap
 
 
+/*
+*  * 订单状态 info_state：10->待支付  20->待接单  30->进行中 40-> 已完成  100->已取消
+*/
 open class SourceDetailsVModel : BViewModel<BRepository>() {
 
     val info: MutableLiveData<DataInfoBean> = MutableLiveData<DataInfoBean>()
 
-    //0运单详情（显示运输轨迹按钮，下一步按钮） 1 货源详情（取消发布 再来一单 接单车辆） 2运单详情-司机端
-    val type: MutableLiveData<Int> = MutableLiveData<Int>()
     //1:需要复制信息再来一单 0直接关闭就行
     var again:Int=0
-    var order_state:Int=0//司机端-订单状态
-
-    val butShow: MutableLiveData<Boolean> = MutableLiveData<Boolean>(false)//司机端
-    val tvTitle: MutableLiveData<String> = MutableLiveData<String>()//司机端
-
-    val isDialogShow: MutableLiveData<Boolean> = MutableLiveData<Boolean>(false)//司机端
-
-
-    var img: MutableLiveData<String> = MutableLiveData("")//司机端
 
 
     @Bindable
@@ -72,35 +55,7 @@ open class SourceDetailsVModel : BViewModel<BRepository>() {
         }
 
     fun getInfo(info_id: String) {
-        if(type.value==2){//司机端
-
-            repository().preq(NetEngine.service.infoGetDriver(info_id))
-                    .doOnNext() {
-                        if (it.ok()) {
-
-                            var bean=it.data()as DataInfoBean
-                            info.value = bean
-
-                            order_state=bean.user_order.order_state
-                            if(order_state==10||order_state==20||order_state==40){
-                                butShow.value=true
-                                when(order_state){
-                                    10->tvTitle.value="开始送货"
-                                    20->tvTitle.value="已送达"
-                                    40->tvTitle.value="待评价"
-                                    else->""
-                                }
-
-                            }else{
-                                butShow.value=false
-                            }
-
-                        }
-                    }
-                    .subscribe()
-
 
-        }else {
             repository().preq(NetEngine.service.infoGet(info_id))
                     .doOnNext() {
                         if (it.ok()) {
@@ -110,7 +65,7 @@ open class SourceDetailsVModel : BViewModel<BRepository>() {
                         }
                     }
                     .subscribe()
-        }
+
     }
 
 
@@ -217,92 +172,30 @@ open class SourceDetailsVModel : BViewModel<BRepository>() {
         }
     }
 
-    fun goDriverList(){
-        //接单车辆 todo
+    fun goDriverList(info_id:String){
+        //接单车辆
         UiSwitch.bundle(repository().context, VehicleListActivity::class.java, Bundle().apply {
-            putInt("type",1)
+            putString("info_id",info_id)
         })
 
     }
 
-    fun goTrack(){
-        //运输轨迹
-
-    }
-
-    fun goStep(){
-        //下一步
-
-    }
-
 
 
    fun isShowCancelBut(info_state:Int):Boolean{
         //取消按钮
-       if(type.value==2){
-           return false
-       }
-         return type.value==1&&(info_state==10||info_state==20)
+
+         return info_state==10||info_state==20
     }
 
     fun isShowReceiveVehicle(info_state:Int):Boolean{
         //接单车辆按钮
 
-        if(type.value==2){
-            return false
-        }
-        return type.value==1&&(info_state==30||info_state==40)
 
-    }
-
-
-    fun toStartShip(order_id:String){
-        //开始送货-司机端
-        if(order_state==10) {
-            QMUIDialog.MessageDialogBuilder(repository().context)
-                    .setTitle("提示")
-                    .setMessage("确定要开始送货么")
-                    .addAction("取消", QMUIDialogAction.ActionListener() { dialog, index ->
-                        dialog.dismiss()
-                    })
-                    .addAction("确定", QMUIDialogAction.ActionListener() { dialog, index ->
-                        setSureSend(order_id)
-                        dialog.dismiss()
-                    })
-                    .show()
-            return
-        }
-        if(order_state==20){//已完成
-
-            isDialogShow.value=true
-            number=""
-        }
-        if(order_state==40){//待评价--司机对货主的评价
-
-            UiSwitch.bundle(repository().context, EvaluateActivity::class.java, Bundle().apply {
-                putString("order_id",order_id)
-            })
-
-
-        }
+        return info_state==30||info_state==40
 
     }
 
-      fun setSureSend(order_id:String){
-
-          var map= HashMap<String, String>()
-          map["order_id"] = order_id
-          map["state"] = "20"
-          repository().lreq(NetEngine.service.setStatus(map))
-                  .doOnNext() {
-                      if (it.ok()) {
-                          order_state=20//变成运输中
-                          tvTitle.value="已送达"
-                      }
-                  }
-                  .subscribe()
-
-    }
 
     @SuppressLint("WrongConstant")
     fun toCallPhone(mobile:String){
@@ -325,49 +218,25 @@ open class SourceDetailsVModel : BViewModel<BRepository>() {
 
     }
 
-    fun interceptClick(){
-        return
-    }
 
-    fun goOperation(type:Int,order_id:String,data_id:String){
-        if(type==1){
-            isDialogShow.value=false
-        }else{
-            //确定
-            if(TextUtils.isEmpty(number)){
-                toast("输入运送数量")
-                return
-            }
-            if(TextUtils.isEmpty(img.value)){
-                toast("请上传凭证")
-                return
-            }
 
-            var map= HashMap<String, String>()
-            map["order_id"] = order_id
-            map["state"] = "30"
-            map["data_id"] =data_id
-            map["img"] = img.value.toString()
-            map["nums"] = number.toString()
-            repository().lreq(NetEngine.service.setStatus(map))
-                    .doOnNext() {
-                        if (it.ok(true)) {
-                            order_state=30//变成待结算
-                            tvTitle.value=""
-                            isDialogShow.value=false
-                        }
-                    }
-                    .subscribe()
+    fun  getOrderStatus(info_state:Int):String{
+        when(info_state){
+            10->return "待支付"
+            20->return "待接单"
+            30->return "进行中"
+            40->return "已完成"
+            100->return "已取消"
+            else ->return ""
 
         }
 
     }
 
-    fun choseImg() {
-        //选择照片
-        ChosePhotoUtils.getChosePhoto(view()!!.context(), 1)
 
-    }
+
+
+
 
 
 }

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

@@ -1,34 +1,47 @@
 package com.quansu.heifengwuliu.vmodel
 
-import android.app.Activity
-import android.content.Intent
+import android.os.Bundle
+import androidx.lifecycle.MutableLiveData
+import com.quansu.heifengwuliu.activity.SourceDetailsActivity
+import com.quansu.heifengwuliu.activity.WaybillDetailsActivity
 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 com.ysnows.base.utils.UiSwitch
 import io.reactivex.Observable
 
-class VehicleListVModel : SearchVModel() {
+class VehicleListVModel : BRViewModel<BRRepository>()  {
 
 
-    fun setSaveDriver(arr: String) {
-        //添加司机
+    val info_id: MutableLiveData<String> = MutableLiveData<String>()
+
 
-        repository()
-                .lreq(NetEngine.service.setDriver(arr))
-                .doOnNext {
-                    if (it.ok(true)) {
-                        val intent = Intent()
-                        var con = repository().context as Activity
-                        con.setResult(Activity.RESULT_OK, intent)
-                        con.finish()
-                    }
-                }
-                .subscribe()
-    }
 
+    fun getOrderStatus(status: Int): String {
+        return when (status) {
+            10 -> "待取货"
+            20 -> "运输中"
+            30 -> "待结算"
+            40 -> "待评价"
+            50 -> "已完成"
+            else -> ""
+        }
+
+    }
 
 
     override fun api(): Observable<out IResponse<*>> {
-        return NetEngine.service.myDriver(k, repository().autoPage())
+        return NetEngine.service.carList(info_id.value, repository().autoPage())
+    }
+
+    fun goDetails(order_id:String){
+        //去运单详情
+        UiSwitch.bundle(repository().context, WaybillDetailsActivity::class.java, Bundle().apply {
+            putString("order_id", order_id)
+            putInt("type",0)
+        })
+
     }
 
 

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

@@ -0,0 +1,317 @@
+package com.quansu.heifengwuliu.vmodel
+
+import android.Manifest
+import android.annotation.SuppressLint
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import android.text.TextUtils
+import android.util.Log
+import android.view.LayoutInflater
+import android.widget.FrameLayout
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.databinding.Bindable
+import androidx.lifecycle.MutableLiveData
+import com.google.gson.Gson
+import com.hwangjr.rxbus.RxBus
+import com.qmuiteam.qmui.layout.QMUIFrameLayout
+import com.qmuiteam.qmui.skin.QMUISkinHelper
+import com.qmuiteam.qmui.skin.QMUISkinValueBuilder
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+import com.qmuiteam.qmui.util.QMUIResHelper
+import com.qmuiteam.qmui.widget.dialog.QMUIDialog
+import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction
+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.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
+import com.quansu.heifengwuliu.model.WaybillDetails
+import com.quansu.heifengwuliu.utils.ChosePhotoUtils
+import com.quansu.heifengwuliu.utils.net.NetEngine
+import com.quansu.heifengwuliu.view.PasswordView
+import com.yanzhenjie.permission.Action
+import com.yanzhenjie.permission.AndPermission
+import com.ysnows.base.base.BRepository
+import com.ysnows.base.base.BViewModel
+import com.ysnows.base.utils.UiSwitch
+import java.util.HashMap
+
+
+/*
+*
+*   订单状态 order_state：0->全部 10->待取货 20->运输中 30->待结算 40->待评价 50->已完成
+*/
+open class WaybillDetailsVModel : BViewModel<BRepository>() {
+
+    val info: MutableLiveData<WaybillDetails> = MutableLiveData<WaybillDetails>()
+    //0货主端  2司机端
+    val type: MutableLiveData<Int> = MutableLiveData<Int>()
+
+    val tvTitle: MutableLiveData<String> = MutableLiveData<String>()
+
+
+    var order_state:Int=0
+
+    var img: MutableLiveData<String> = MutableLiveData("")//司机端
+    val isDialogShow: MutableLiveData<Boolean> = MutableLiveData<Boolean>(false)//司机端
+
+    val isButShow: MutableLiveData<Boolean> = MutableLiveData<Boolean>(true)
+
+
+
+
+    @Bindable
+    var number: String? = null
+        set(value) {
+            field = value
+            notifyPropertyChanged(BR.number)
+        }
+
+
+    fun getInfo(order_id: String) {
+
+        if(type.value==0){//货主端-运单详情
+
+            repository().preq(NetEngine.service.orderGet(order_id))
+                    .doOnNext() {
+                        if (it.ok()) {
+
+                            info.value = it.data() as WaybillDetails
+                            order_state= info.value!!.order.order_state
+                            when(info.value!!.order.order_state){
+                                10->tvTitle.value="运输轨迹"
+                                20->tvTitle.value="运输轨迹"
+                                30->tvTitle.value="去结算"
+                                40->tvTitle.value= "待评价"
+                                50->tvTitle.value="查看评价"
+                            }
+
+                        }
+                    }
+                    .subscribe()
+
+        }else{ //司机端-货主详情
+
+            repository().preq(NetEngine.service.orderGetDriver(order_id))
+                    .doOnNext() {
+                        if (it.ok()) {
+
+                            info.value = it.data()as WaybillDetails
+                            order_state= info.value!!.order.order_state
+                            isButShow.value = order_state==10||order_state==20||order_state==40||order_state==50
+
+                            when(info.value!!.order.order_state){
+                                10->tvTitle.value="开始送货"
+                                20->tvTitle.value="已送达"
+                                40->tvTitle.value="待评价"
+                                50->tvTitle.value="查看评价"
+                            }
+
+                        }
+                    }
+                    .subscribe()
+        }
+
+
+
+
+    }
+
+
+    fun toStartShip(order_id:String){
+
+        if(type.value==0) {
+            //0->全部 10->待取货 20->运输中 30->待结算 40->待评价 50->已完成
+//        10->tvTitle.value="运输轨迹"
+//        20->tvTitle.value="运输轨迹"
+//        30->tvTitle.value="去结算"
+//        40->tvTitle.value= "待评价"
+//        50->tvTitle.value="查看评价"
+
+            if (order_state == 10 || order_state == 20) {
+
+
+                return
+            }
+
+            if (order_state == 30) {
+
+
+                return
+            }
+
+            if (order_state == 40) {
+
+
+                return
+            }
+            if (order_state == 50) {
+
+
+                return
+            }
+
+        }else{//司机端
+
+            if(order_state==10) {
+                QMUIDialog.MessageDialogBuilder(repository().context)
+                        .setTitle("提示")
+                        .setMessage("确定要开始送货么")
+                        .addAction("取消", QMUIDialogAction.ActionListener() { dialog, index ->
+                            dialog.dismiss()
+                        })
+                        .addAction("确定", QMUIDialogAction.ActionListener() { dialog, index ->
+                            setSureSend(order_id)
+                            dialog.dismiss()
+                        })
+                        .show()
+                return
+            }
+            if(order_state==20){//已完成
+
+                isDialogShow.value=true
+                number=""
+            }
+            if(order_state==40){//待评价--司机对货主的评价
+
+                UiSwitch.bundle(repository().context, EvaluateActivity::class.java, Bundle().apply {
+                    putString("order_id",order_id)
+                })
+
+
+            }
+
+            if(order_state==50){//查看评价
+
+
+            }
+
+
+
+
+
+        }
+
+
+
+    }
+
+
+    fun setSureSend(order_id:String){
+
+        var map= HashMap<String, String>()
+        map["order_id"] = order_id
+        map["state"] = "20"
+        repository().lreq(NetEngine.service.setStatus(map))
+                .doOnNext() {
+                    if (it.ok()) {
+                        order_state=20//变成运输中
+                        tvTitle.value="已送达"
+                    }
+                }
+                .subscribe()
+
+    }
+
+
+
+    @SuppressLint("WrongConstant")
+    fun toCallPhone(mobile:String){
+        //拨打电话
+        if(TextUtils.isEmpty(mobile)){
+            toast("未添加该公司的电话！！")
+            return
+        }
+
+        AndPermission.with(repository().context)
+                .runtime()
+                .permission(Manifest.permission.CALL_PHONE)
+                .onGranted(Action<List<String?>?> {
+                    val intent = Intent(Intent.ACTION_DIAL)
+                    val uri = Uri.parse("tel:$mobile")
+                    intent.data = uri
+                    repository().context!!.startActivity(intent)
+                }).start()
+
+
+    }
+
+    fun interceptClick(){
+        return
+    }
+    fun choseImg() {
+        //选择照片
+        ChosePhotoUtils.getChosePhoto(view()!!.context(), 1)
+
+    }
+    fun goOperation(type:Int,order_id:String,data_id:String){
+        if(type==1){
+            isDialogShow.value=false
+        }else{
+            //确定
+            if(TextUtils.isEmpty(number)){
+                toast("输入运送数量")
+                return
+            }
+            if(TextUtils.isEmpty(img.value)){
+                toast("请上传凭证")
+                return
+            }
+
+            var map= HashMap<String, String>()
+            map["order_id"] = order_id
+            map["state"] = "30"
+            map["data_id"] =data_id
+            map["img"] = img.value.toString()
+            map["nums"] = number.toString()
+            repository().lreq(NetEngine.service.setStatus(map))
+                    .doOnNext() {
+                        if (it.ok(true)) {
+                            order_state=30//变成待结算
+                            tvTitle.value=""
+                            isDialogShow.value=false
+                        }
+                    }
+                    .subscribe()
+
+        }
+
+    }
+
+    fun  getOrderStatus(order_state:Int):String {
+        //0->全部 10->待取货 20->运输中 30->待结算 40->待评价 50->已完成
+        if (type.value == 0) {//货主端
+            when (order_state) {
+                10 -> return "待取货"
+                20 -> return "进行中"
+                30 -> return "待结算"
+                40 -> return "待评价"
+                50 -> return "已完成"
+                else -> return ""
+
+            }
+        } else { //司机端
+            when (order_state) {
+                10 -> return "待取货"
+                20 -> return "进行中"
+                30 -> return "待结算"
+                40 -> return "待评价"
+                50 -> return "已完成"
+                else -> return ""
+
+            }
+        }
+    }
+
+
+
+    }

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

@@ -20,10 +20,11 @@
         android:background="@color/color_page_bg"
         android:orientation="vertical">
 
-        <FrameLayout
+        <ScrollView
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:scrollbars="none">
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -31,746 +32,248 @@
                 android:orientation="vertical">
 
 
-                <ScrollView
+                <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_weight="1"
-                    android:scrollbars="none">
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="17dp"
+                    android:layout_marginTop="12dp"
+                    android:layout_marginEnd="16dp"
+                    android:orientation="vertical"
+                    android:paddingStart="11dp"
+                    android:paddingTop="20dp"
+                    android:paddingEnd="14dp"
+                    android:paddingBottom="20dp"
+                    app:qmui_backgroundColor="@color/white"
+                    app:qmui_radius="@dimen/dp_4">
 
                     <LinearLayout
                         android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:orientation="vertical">
+                        android:layout_height="wrap_content"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal">
 
+                        <ImageView
+                            android:id="@+id/iv_yellow"
+                            android:layout_width="9dp"
+                            android:layout_height="10dp"
+                            android:layout_marginStart="18dp"
+                            android:src="@drawable/ic_circle_yellow" />
 
-                        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
-                            android:layout_width="match_parent"
+                        <TextView
+                            android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_marginStart="17dp"
-                            android:layout_marginTop="12dp"
-                            android:layout_marginEnd="16dp"
-                            android:orientation="vertical"
-                            android:paddingStart="11dp"
-                            android:paddingTop="20dp"
-                            android:paddingEnd="14dp"
-                            android:paddingBottom="20dp"
-                            app:qmui_backgroundColor="@color/white"
-                            app:qmui_radius="@dimen/dp_4">
-
-                            <LinearLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:gravity="center_vertical"
-                                android:orientation="horizontal">
-
-                                <ImageView
-                                    android:id="@+id/iv_yellow"
-                                    android:layout_width="9dp"
-                                    android:layout_height="10dp"
-                                    android:layout_marginStart="18dp"
-                                    android:src="@drawable/ic_circle_yellow" />
-
-                                <TextView
-                                    android:layout_width="0dp"
-                                    android:layout_height="wrap_content"
-                                    android:layout_weight="1"
-                                    android:gravity="center"
-                                    android:text="@{vm.info.order.send[0].province.name+vm.info.order.send[0].city.name}"
-                                    android:textColor="@color/text_title"
-                                    android:textSize="@dimen/sp_15"
-                                    tools:text="山东 临沂"></TextView>
-
-                                <ImageView
-                                    android:layout_width="26dp"
-                                    android:layout_height="4dp"
-                                    android:src="@drawable/ic_long_arrow"></ImageView>
-
-
-                                <ImageView
-                                    android:id="@+id/iv_red"
-                                    android:layout_width="9dp"
-                                    android:layout_height="10dp"
-                                    android:layout_marginStart="14dp"
-                                    android:src="@drawable/ic_circle_red" />
-
-                                <TextView
-                                    android:id="@+id/tv_city_in"
-                                    android:layout_width="0dp"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginEnd="@dimen/dp_10"
-                                    android:layout_weight="1"
-                                    android:gravity="center"
-                                    android:text="@{vm.info.order.receive[vm.info.order.receive.size()-1].province.name+vm.info.order.receive[vm.info.order.receive.size()-1].city.name}"
-                                    android:textColor="@color/text_title"
-                                    android:textSize="@dimen/sp_15"
-                                    tools:text="河北 唐山"></TextView>
-
-
-                            </LinearLayout>
-
-                            <View
-                                android:layout_width="match_parent"
-                                android:layout_height="1dp"
-                                android:layout_marginStart="2dp"
-                                android:layout_marginTop="17dp"
-                                android:background="#E3E4E5" />
-
-
-                            <RelativeLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content">
-
-                                <androidx.recyclerview.widget.RecyclerView
-                                    android:id="@+id/recycler_view_out"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-                                    tools:listitem="@layout/item_peopleinfo">
-
-                                </androidx.recyclerview.widget.RecyclerView>
-                            </RelativeLayout>
-
-
-                            <View
-                                android:layout_width="match_parent"
-                                android:layout_height="1dp"
-                                android:layout_marginStart="2dp"
-                                android:layout_marginTop="24dp"
-                                android:background="#E3E4E5" />
-
-
-                            <RelativeLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content">
-
-
-                                <androidx.recyclerview.widget.RecyclerView
-                                    android:id="@+id/recycler_view_in"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-                                    tools:listitem="@layout/item_enterinfo" />
-
-                            </RelativeLayout>
-
-                        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
-
-
-                        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="76dp"
-                            android:layout_marginStart="17dp"
-                            android:layout_marginTop="12dp"
-                            android:layout_marginEnd="16dp"
-                            android:gravity="center_vertical"
-                            android:orientation="horizontal"
-                            android:paddingStart="11dp"
-                            android:paddingEnd="26dp"
-                            android:visibility="@{vm.type==2?View.VISIBLE :View.GONE}"
-                            app:layout_goneMarginTop="@dimen/dp_10"
-                            app:qmui_backgroundColor="@color/white"
-                            app:qmui_radius="@dimen/dp_4">
-
-
-                            <ImageView
-                                android:layout_width="40dp"
-                                android:layout_height="40dp"
-                                android:layout_marginTop="21dp"
-                                android:layout_marginBottom="21dp"
-                                android:src="@drawable/bg_need_error" />
-
-                            <LinearLayout
-                                android:layout_width="0dp"
-                                android:layout_height="match_parent"
-                                android:layout_marginStart="8dp"
-                                android:layout_marginEnd="8dp"
-                                android:layout_weight="1"
-                                android:orientation="vertical">
-
-                                <TextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginTop="16dp"
-                                    android:text="@{vm.info.company.company_name}"
-                                    android:textColor="@color/text_title"
-                                    android:textSize="16sp"
-                                    android:textStyle="bold"
-                                    tools:text="临沂市昆仑物流有限公司" />
-
-
-                                <LinearLayout
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginTop="7dp"
-                                    android:orientation="horizontal">
-
-                                    <TextView
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:layout_marginEnd="@dimen/dp_10"
-                                        android:text="累计交易"
-                                        android:textColor="#979899"
-                                        android:textSize="16sp" />
-
-                                    <TextView
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:text="@{vm.info.company.info_nums+@string/single}"
-                                        android:textColor="#979899"
-                                        android:textSize="16sp"
-                                        tools:text="@string/single" />
-
-
-                                    <TextView
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:layout_marginStart="@dimen/dp_10"
-                                        android:layout_marginEnd="@dimen/dp_10"
-                                        android:text="好评率"
-                                        android:textColor="#979899"
-                                        android:textSize="16sp" />
-
-                                    <TextView
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:text="@{vm.info.company.hpl+@string/percent_sign}"
-                                        android:textColor="#979899"
-                                        android:textSize="16sp"
-
-                                        tools:text="@string/percent_sign" />
-
-
-                                </LinearLayout>
-
-
-                            </LinearLayout>
-
-                            <LinearLayout
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:onClick="@{v->vm.toCallPhone(vm.info.company.mobile)}"
-                                android:orientation="vertical">
-
-                                <ImageView
-                                    android:layout_width="24dp"
-                                    android:layout_height="24dp"
-                                    android:src="@drawable/ic_details_phone" />
-
-
-                                <TextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginTop="4dp"
-                                    android:text="@{vm.info.company.name}"
-                                    android:textColor="@color/text_title"
-                                    android:textSize="13sp"
-                                    tools:text="马勇" />
-
-
-                            </LinearLayout>
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:text="@{vm.info.order.send[0].province.name+vm.info.order.send[0].city.name}"
+                            android:textColor="@color/text_title"
+                            android:textSize="@dimen/sp_15"
+                            tools:text="山东 临沂"></TextView>
 
+                        <ImageView
+                            android:layout_width="26dp"
+                            android:layout_height="4dp"
+                            android:src="@drawable/ic_long_arrow"></ImageView>
 
-                        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
-
-                        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="76dp"
-                            android:layout_marginStart="17dp"
-                            android:layout_marginTop="12dp"
-                            android:layout_marginEnd="16dp"
-                            android:gravity="center_vertical"
-                            android:orientation="horizontal"
-                            android:paddingStart="11dp"
-                            android:paddingEnd="26dp"
-                            android:visibility="@{vm.type==0?View.VISIBLE :View.GONE}"
-                            app:layout_goneMarginTop="@dimen/dp_10"
-                            app:qmui_backgroundColor="@color/white"
-                            app:qmui_radius="@dimen/dp_4">
-
-
-                            <ImageView
-                                android:layout_width="40dp"
-                                android:layout_height="40dp"
-                                android:src="@drawable/bg_need_error">
-
-                            </ImageView>
-
-                            <LinearLayout
-                                android:layout_width="0dp"
-                                android:layout_height="match_parent"
-                                android:layout_marginStart="8dp"
-                                android:layout_marginEnd="@dimen/dp_10"
-                                android:layout_weight="1"
-                                android:gravity="center"
-                                android:orientation="vertical">
-
-                                <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:textColor="@color/text_title"
-                                        android:textSize="@dimen/sp_14"
-                                        tools:text="乔治"></TextView>
-
-                                    <TextView
-                                        android:layout_width="0dp"
-                                        android:layout_height="wrap_content"
-                                        android:layout_marginStart="@dimen/dp_10"
-                                        android:layout_weight="1"
-                                        android:textColor="@color/text_title"
-                                        android:textSize="@dimen/sp_15"
-                                        tools:text="18535965350"></TextView>
-
-
-                                </LinearLayout>
-
-                                <LinearLayout
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginTop="6dp"
-                                    android:orientation="horizontal">
-
-                                    <TextView
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:textColor="#979899"
-                                        android:textSize="@dimen/sp_13"
-                                        tools:text="鲁QAA888"></TextView>
-
-                                    <TextView
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:layout_marginStart="@dimen/dp_10"
-                                        android:layout_marginEnd="@dimen/dp_10"
-                                        android:text="/"
-                                        android:textColor="#979899"
-                                        android:textSize="@dimen/sp_13"></TextView>
-
-                                    <TextView
-                                        android:layout_width="0dp"
-                                        android:layout_height="wrap_content"
-                                        android:layout_weight="1"
-                                        android:textColor="#979899"
-                                        android:textSize="@dimen/sp_13"
-                                        tools:text="平板车 13米"></TextView>
-
-
-                                </LinearLayout>
-
-
-                            </LinearLayout>
-
-                            <ImageView
-                                android:layout_width="24dp"
-                                android:layout_height="24dp"
-                                android:src="@drawable/ic_details_phone">
-
-                            </ImageView>
-
-
-                        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
-
-
-                        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
-                            android:layout_width="match_parent"
+                        <ImageView
+                            android:id="@+id/iv_red"
+                            android:layout_width="9dp"
+                            android:layout_height="10dp"
+                            android:layout_marginStart="14dp"
+                            android:src="@drawable/ic_circle_red" />
+
+                        <TextView
+                            android:id="@+id/tv_city_in"
+                            android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_marginStart="17dp"
-                            android:layout_marginTop="@dimen/dp_10"
-                            android:layout_marginEnd="16dp"
-                            android:orientation="vertical"
-                            android:paddingStart="21dp"
-                            android:paddingTop="20dp"
-                            android:paddingEnd="16dp"
-                            android:paddingBottom="18dp"
-                            app:qmui_backgroundColor="@color/white"
-                            app:qmui_borderColor="@color/white"
-                            app:qmui_radius="@dimen/dp_4">
-
-
-                            <LinearLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="@dimen/dp_10"
-                                android:gravity="center_vertical"
-                                android:orientation="horizontal">
-
-                                <TextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:text="运单号"
-                                    android:textColor="#767778"
-                                    android:textSize="@dimen/sp_14" />
-
-                                <TextView
-
-                                    android:layout_width="0dp"
-                                    android:layout_height="wrap_content"
-                                    android:layout_weight="1"
-                                    android:gravity="right"
-                                    android:text="@{vm.info.order.info_sn}"
-                                    android:textColor="@color/text_title"
-                                    android:textSize="@dimen/sp_13"
-                                    tools:text="电话:1835399999"></TextView>
-
-
-                            </LinearLayout>
-
-                            <LinearLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="12dp"
-                                android:gravity="center_vertical"
-                                android:orientation="horizontal"
-                                android:visibility="@{vm.info.order.type==1?View.VISIBLE :View.GONE}">
-
-                                <TextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:text="货物信息"
-                                    android:textColor="#767778"
-                                    android:textSize="@dimen/sp_14" />
-
-
-                                <TextView
-
-                                    android:layout_width="0dp"
-                                    android:layout_height="wrap_content"
-                                    android:layout_weight="1"
-                                    android:gravity="right"
-                                    android:text="@{vm.info.order.receive[0].goods+@string/spot+vm.info.order.receive[0].nums+vm.info.order.receive[0].nums_type.name}"
-                                    android:textColor="@color/text_title"
-                                    android:textSize="@dimen/sp_13"
-                                    tools:text="电话:1835399999"></TextView>
-
-
-                            </LinearLayout>
-
-                            <LinearLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="@dimen/dp_14"
-                                android:gravity="center_vertical"
-                                android:orientation="horizontal">
-
-                                <TextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:text="车型车长"
-                                    android:textColor="#767778"
-                                    android:textSize="@dimen/sp_14" />
-
-
-                                <TextView
-                                    android:layout_width="0dp"
-                                    android:layout_height="wrap_content"
-                                    android:layout_weight="1"
-                                    android:gravity="right"
-                                    android:text="@{vm.info.order.type_info.type_name+@string/spot+vm.info.order.type_info.length+@string/rice}"
-                                    android:textColor="@color/text_title"
-                                    android:textSize="@dimen/sp_14"
-                                    tools:text="电话:1835399999"></TextView>
-
-
-                            </LinearLayout>
-
-                            <LinearLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="@dimen/dp_13"
-                                android:gravity="center_vertical"
-                                android:orientation="horizontal">
-
-                                <TextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:text="备注"
-                                    android:textColor="#767778"
-                                    android:textSize="@dimen/sp_14" />
-
-
-                                <TextView
-
-                                    android:layout_width="0dp"
-                                    android:layout_height="wrap_content"
-                                    android:layout_weight="1"
-                                    android:gravity="right"
-                                    android:text="@{vm.info.order.data}"
-                                    android:textColor="@color/text_title"
-                                    android:textSize="@dimen/sp_14"
-                                    tools:text="电话:1835399999"></TextView>
+                            android:layout_marginEnd="@dimen/dp_10"
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:text="@{vm.info.order.receive[vm.info.order.receive.size()-1].province.name+vm.info.order.receive[vm.info.order.receive.size()-1].city.name}"
+                            android:textColor="@color/text_title"
+                            android:textSize="@dimen/sp_15"
+                            tools:text="河北 唐山"></TextView>
 
 
-                            </LinearLayout>
+                    </LinearLayout>
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="1dp"
+                        android:layout_marginStart="2dp"
+                        android:layout_marginTop="17dp"
+                        android:background="#E3E4E5" />
 
-                            <LinearLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="13dp"
-                                android:gravity="center_vertical"
-                                android:orientation="horizontal">
 
-                                <TextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:text="纸质回单"
-                                    android:textColor="#767778"
-                                    android:textSize="@dimen/sp_14" />
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
 
+                        <androidx.recyclerview.widget.RecyclerView
+                            android:id="@+id/recycler_view_out"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                            tools:listitem="@layout/item_peopleinfo"
+                            tools:visibility="gone">
 
-                                <TextView
-                                    android:layout_width="0dp"
-                                    android:layout_height="wrap_content"
-                                    android:layout_weight="1"
-                                    android:gravity="right"
-                                    android:textColor="@color/text_title"
-                                    android:textSize="@dimen/sp_14"
-                                    tools:text="电话:1835399999"></TextView>
+                        </androidx.recyclerview.widget.RecyclerView>
+                    </RelativeLayout>
 
 
-                            </LinearLayout>
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="1dp"
+                        android:layout_marginStart="2dp"
+                        android:layout_marginTop="24dp"
+                        android:background="#E3E4E5" />
 
 
-                        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
 
 
-                        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+                        <androidx.recyclerview.widget.RecyclerView
+                            android:id="@+id/recycler_view_in"
                             android:layout_width="match_parent"
-                            android:layout_height="50dp"
-                            android:layout_marginStart="@dimen/dp_17"
-                            android:layout_marginTop="@dimen/dp_12"
-                            android:layout_marginEnd="@dimen/dp_16"
-                            android:layout_marginBottom="9dp"
-                            android:gravity="center"
-                            android:orientation="vertical"
-                            android:paddingStart="21dp"
-                            android:paddingEnd="16dp"
-                            app:layout_goneMarginTop="@dimen/dp_10"
-                            app:qmui_backgroundColor="@color/white"
-                            app:qmui_radius="@dimen/dp_4">
+                            android:layout_height="wrap_content"
+                            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                            tools:listitem="@layout/item_enterinfo"
+                            tools:visibility="gone" />
 
+                    </RelativeLayout>
 
-                            <LinearLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:gravity="center_vertical"
-                                android:orientation="horizontal">
+                </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
-                                <TextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:text="运费"
-                                    android:textColor="#767778"
-                                    android:textSize="@dimen/sp_14"></TextView>
 
-                                <TextView
-                                    android:layout_width="0dp"
-                                    android:layout_height="wrap_content"
-                                    android:layout_weight="1"
-                                    android:gravity="right"
-                                    android:text="@{@string/total_img+vm.info.order.total}"
-                                    android:textColor="@color/text_title"
-                                    android:textSize="@dimen/sp_14"
-                                    tools:text="￥30000"></TextView>
+                <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="17dp"
+                    android:layout_marginTop="@dimen/dp_10"
+                    android:layout_marginEnd="16dp"
+                    android:orientation="vertical"
+                    android:paddingStart="21dp"
+                    android:paddingTop="20dp"
+                    android:paddingEnd="16dp"
+                    android:paddingBottom="18dp"
+                    app:qmui_backgroundColor="@color/white"
+                    app:qmui_borderColor="@color/white"
+                    app:qmui_radius="@dimen/dp_4">
 
 
-                            </LinearLayout>
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/dp_10"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal">
 
-                        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="运单号"
+                            android:textColor="#767778"
+                            android:textSize="@dimen/sp_14" />
 
+                        <TextView
 
-                        <!--     司机端按钮           -->
-                        <FrameLayout
-                            android:layout_width="match_parent"
+                            android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_marginStart="16dp"
-                            android:layout_marginEnd="@dimen/dp_16"
-                            android:onClick="@{v->vm.toStartShip(vm.info.user_order.order_id)}"
-                            android:visibility="@{vm.butShow?View.VISIBLE:View.GONE}">
+                            android:layout_weight="1"
+                            android:gravity="right"
+                            android:text="@{vm.info.order.info_sn}"
+                            android:textColor="@color/text_title"
+                            android:textSize="@dimen/sp_13"
+                            tools:text="电话:1835399999"></TextView>
 
-                            <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="@{vm.tvTitle}"
-                                android:textColor="@color/white"
-                                android:textSize="16sp">
+                    </LinearLayout>
 
-                            </TextView>
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="12dp"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal"
+                       >
 
-                        </FrameLayout>
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="货源状态"
+                            android:textColor="#767778"
+                            android:textSize="@dimen/sp_14" />
+
+
+                        <TextView
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:gravity="right"
+                            tools:text="进行中"
+                            android:text="@{vm.getOrderStatus(vm.info.order.info_state)}"
+                            android:textColor="@color/text_title"
+                            android:textSize="@dimen/sp_13"
+                          ></TextView>
 
 
                     </LinearLayout>
-                </ScrollView>
 
-                <!--        货主端按钮-->
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="@dimen/dp_10"
-                    android:orientation="horizontal"
-                    android:layout_marginTop="10dp"
-                    android:visibility="@{vm.type==2?View.GONE:View.VISIBLE}">
-
-
-                    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-                        android:id="@+id/but_cancel"
-                        android:layout_width="120dp"
-                        android:layout_height="@dimen/dp_40"
-                        android:layout_marginStart="@dimen/dp_10"
-                        android:onClick="@{v->vm.setCancelOrder(vm.info.order.info_id)}"
-                        android:text="取消发布"
-                        android:textColor="@color/white"
-                        android:textSize="16sp"
-                        android:visibility="@{vm.isShowCancelBut(vm.info.order.info_state)?View.VISIBLE:View.GONE}"
-                        app:qmui_borderColor="#FF6029"
-                        app:qmui_backgroundColor="#FF6029"
-                        app:qmui_radius="25dp">
-
-                    </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton>
-
-                    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-                        android:id="@+id/but_comeback"
-                        android:layout_width="120dp"
-                        android:layout_height="@dimen/dp_40"
-                        android:layout_marginStart="@dimen/dp_15"
-                        android:onClick="@{v->vm.anotherOne()}"
-                        android:text="再来一单"
-                        android:textSize="16dp"
-                        android:textColor="@color/white"
-                        android:visibility="@{vm.type==1?View.VISIBLE:View.GONE}"
-                        app:qmui_borderColor="#F3B23E"
-                        app:qmui_backgroundColor="#F3B23E"
-                        app:qmui_radius="25dp">
-
-                    </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:onClick="@{v->vm.goDriverList()}"
-                        android:text="接单车辆"
-                        android:textColor="@color/white"
-                        android:visibility="@{vm.isShowReceiveVehicle(vm.info.order.info_state)?View.VISIBLE:View.GONE}"
-                        app:qmui_borderColor="#F3AC3C"
-                        app:qmui_backgroundColor="#F3AC3C"
-                        android:textSize="16sp"
-                        app:qmui_radius="25dp">
-
-                    </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton>
-
-
-                    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-                        android:id="@+id/but_track"
-                        android:layout_width="120dp"
-                        android:layout_height="@dimen/dp_40"
-                        android:layout_marginStart="@dimen/dp_15"
-                        android:onClick="@{v->vm.goTrack()}"
-                        android:text="运输轨迹"
-                        android:textColor="@color/white"
-                        android:visibility="@{vm.type==0?View.VISIBLE:View.GONE}"
-                        app:qmui_borderColor="#F2AB3C"
-                        app:qmui_backgroundColor="#F2AB3C"
-                        android:textSize="16sp"
-                        app:qmui_radius="25dp">
-
-                    </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton>
-
-
-                    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-                        android:id="@+id/but_step"
-                        android:layout_width="120dp"
-                        android:layout_height="@dimen/dp_40"
-                        android:layout_marginStart="@dimen/dp_15"
-                        android:onClick="@{v->vm.goStep()}"
-                        android:text="下一步"
-                        android:textSize="16sp"
-                        android:textColor="@color/white"
-                        android:visibility="@{vm.type==0?View.VISIBLE:View.GONE}"
-                        app:qmui_borderColor="#F2AB3C"
-                        app:qmui_backgroundColor="#F2AB3C"
-                        app:qmui_radius="25dp">
-
-                    </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton>
-
-
-                </LinearLayout>
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/dp_14"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal">
 
-            </LinearLayout>
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="车型车长"
+                            android:textColor="#767778"
+                            android:textSize="@dimen/sp_14" />
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="#80000000"
-                android:gravity="center"
-                tools:visibility="gone"
-                android:visibility="@{vm.isDialogShow?View.VISIBLE:View.GONE}"
-                android:onClick="@{v->vm.interceptClick()}"
-                android:orientation="vertical">
 
+                        <TextView
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:gravity="right"
+                            android:text="@{vm.info.order.type_info.type_name+@string/spot+vm.info.order.type_info.length+@string/rice}"
+                            android:textColor="@color/text_title"
+                            android:textSize="@dimen/sp_14"
+                            tools:text="电话:1835399999"></TextView>
 
-                <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="27dp"
-                    android:layout_marginEnd="27dp"
-                    android:orientation="vertical"
-                    app:qmui_backgroundColor="@color/white"
-                    app:qmui_borderColor="@color/white"
-                    app:qmui_radius="8dp">
+
+                    </LinearLayout>
 
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="20dp"
-                        android:layout_marginTop="36dp"
-                        android:layout_marginEnd="20dp"
-                        android:layout_marginBottom="24dp"
+                        android:layout_marginTop="@dimen/dp_13"
                         android:gravity="center_vertical"
                         android:orientation="horizontal">
 
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="输入运送数量"
-                            android:textColor="#000000"
-                            android:textSize="17sp"
-                            android:textStyle="bold" />
-
-                        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="40dp"
-                            android:layout_marginStart="10dp"
-                            android:gravity="center_vertical"
-                            app:qmui_backgroundColor="#F4F5F6"
-                            app:qmui_borderColor="#F4F5F6"
-                            app:qmui_radius="4dp">
+                            android:text="备注"
+                            android:textColor="#767778"
+                            android:textSize="@dimen/sp_14" />
 
 
-                            <com.ysnows.base.widget.DelEditText
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:background="@null"
-                                android:hint="请输入要实际送达数量"
-                                android:textColor="#26292F"
-                                android:text="@={vm.number}"
-                                android:paddingStart="15dp"
-                                android:textColorHint="#979899"
-                                android:textSize="@dimen/sp_13" />
+                        <TextView
 
-                        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:gravity="right"
+                            android:text="@{vm.info.order.data}"
+                            android:textColor="@color/text_title"
+                            android:textSize="@dimen/sp_14"
+                            tools:text="电话:1835399999"></TextView>
 
 
                     </LinearLayout>
@@ -778,91 +281,147 @@
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="20dp"
-                        android:layout_marginBottom="4dp"
+                        android:layout_marginTop="13dp"
+                        android:gravity="center_vertical"
                         android:orientation="horizontal">
 
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="凭证"
-                            android:textColor="#000000"
-                            android:textSize="17sp"
-                            android:textStyle="bold" />
+                            android:text="纸质回单"
+                            android:textColor="#767778"
+                            android:textSize="@dimen/sp_14" />
 
 
-                        <ImageView
-                            android:layout_width="57dp"
-                            android:layout_height="59dp"
-                            android:layout_marginStart="18dp"
-                            android:scaleType="fitXY"
-                            android:onClick="@{v->vm.choseImg()}"
-                            app:url="@{vm.img}"
-                            android:src="@drawable/ic_chose_img" />
+                        <TextView
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:gravity="right"
+                            android:textColor="@color/text_title"
+                            android:textSize="@dimen/sp_14"
+                            tools:text="电话:1835399999"></TextView>
+
 
                     </LinearLayout>
 
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="68dp"
-                        android:layout_marginBottom="25dp"
-                        android:text="（上传照片）"
-                        android:textColor="#9D9D9D"
-                        android:textSize="11dp">
 
-                    </TextView>
+                </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+
+                <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:layout_marginStart="@dimen/dp_17"
+                    android:layout_marginTop="@dimen/dp_12"
+                    android:layout_marginEnd="@dimen/dp_16"
+                    android:layout_marginBottom="9dp"
+                    android:gravity="center"
+                    android:orientation="vertical"
+                    android:paddingStart="21dp"
+                    android:paddingEnd="16dp"
+                    app:layout_goneMarginTop="@dimen/dp_10"
+                    app:qmui_backgroundColor="@color/white"
+                    app:qmui_radius="@dimen/dp_4">
 
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:background="#E3E4E5" />
 
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:gravity="center_vertical"
                         android:orientation="horizontal">
 
                         <TextView
-                            android:layout_width="0dp"
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:layout_marginTop="15dp"
-                            android:layout_marginBottom="17dp"
-                            android:gravity="center"
-                            android:onClick="@{v->vm.goOperation(1,vm.info.user_order.order_id,vm.info.order.send[0].data_id)}"
-                            android:text="取消"
-                            android:textColor="#26292F"
-                            android:textSize="17sp" />
-
-                        <View
-                            android:layout_width="1dp"
-                            android:layout_height="match_parent"
-                            android:background="#E3E4E5" />
+                            android:text="运费"
+                            android:textColor="#767778"
+                            android:textSize="@dimen/sp_14"></TextView>
 
                         <TextView
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="15dp"
-                            android:layout_marginBottom="17dp"
                             android:layout_weight="1"
-                            android:onClick="@{v->vm.goOperation(2,vm.info.user_order.order_id,vm.info.order.send[0].data_id)}"
-                            android:gravity="center"
-                            android:text="确定"
-                            android:textColor="#FFBC00"
-                            android:textSize="17sp" />
+                            android:gravity="right"
+                            android:text="@{@string/total_img+vm.info.order.total}"
+                            android:textColor="@color/text_title"
+                            android:textSize="@dimen/sp_14"
+                            tools:text="￥30000"></TextView>
 
 
                     </LinearLayout>
 
-
                 </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
 
-            </LinearLayout>
 
 
-        </FrameLayout>
+            </LinearLayout>
+        </ScrollView>
+
+        <!--        货主端按钮-->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:orientation="horizontal"
+            >
+
+
+            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+                android:id="@+id/but_cancel"
+                android:layout_width="120dp"
+                android:layout_height="@dimen/dp_40"
+                android:layout_marginStart="@dimen/dp_10"
+                android:onClick="@{v->vm.setCancelOrder(vm.info.order.info_id)}"
+                android:text="取消发布"
+                android:textColor="@color/white"
+                android:textSize="16sp"
+                android:visibility="@{vm.isShowCancelBut(vm.info.order.info_state)?View.VISIBLE:View.GONE}"
+                app:qmui_backgroundColor="#FF6029"
+                app:qmui_borderColor="#FF6029"
+                app:qmui_radius="25dp">
+
+            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton>
+
+            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+                android:id="@+id/but_comeback"
+                android:layout_width="120dp"
+                android:layout_height="@dimen/dp_40"
+                android:layout_marginStart="@dimen/dp_15"
+                android:onClick="@{v->vm.anotherOne()}"
+                android:text="再来一单"
+                android:textColor="@color/white"
+                android:textSize="16dp"
+                app:qmui_backgroundColor="#F3B23E"
+                app:qmui_borderColor="#F3B23E"
+                app:qmui_radius="25dp">
+
+            </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:onClick="@{v->vm.goDriverList(vm.info.order.info_id)}"
+                android:text="@{@string/receiving_vehicle+@string/left_bracket+vm.info.order.car_nums+@string/right_bracket}"
+                android:textColor="@color/white"
+                android:textSize="16sp"
+                android:visibility="@{vm.isShowReceiveVehicle(vm.info.order.info_state)?View.VISIBLE:View.GONE}"
+                app:qmui_backgroundColor="#F3AC3C"
+                app:qmui_borderColor="#F3AC3C"
+                tools:text="接单车辆"
+                app:qmui_radius="25dp">
+
+            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton>
+
+
+
+
+
+        </LinearLayout>
 
 
     </LinearLayout>

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

@@ -1,47 +1,37 @@
 <?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 >
+    xmlns:tools="http://schemas.android.com/tools">
 
+    <data>
         <variable
             name="vm"
             type="com.quansu.heifengwuliu.vmodel.VehicleListVModel" />
-    </data >
+    </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}" />
+        android:background="@color/color_bg"
+        android:orientation="vertical">
 
 
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+            android:id="@+id/refresh_layout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
 
-            <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-                android:id="@+id/refresh_layout"
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recycler_view"
                 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 >
-
+                android:layout_height="match_parent"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                tools:listitem="@layout/item_vehiclelist" />
 
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
 
-    </LinearLayout >
+    </LinearLayout>
 
-</layout >
+</layout>

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

@@ -0,0 +1,791 @@
+<?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>
+
+        <import type="android.view.View" />
+
+        <variable
+            name="vm"
+            type="com.quansu.heifengwuliu.vmodel.WaybillDetailsVModel" />
+
+    </data>
+
+    <LinearLayout
+        android:id="@+id/ll"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/color_page_bg"
+        android:orientation="vertical">
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+
+                <ScrollView
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="1"
+                    android:scrollbars="none">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        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:paddingTop="20dp"
+                            android:paddingEnd="14dp"
+                            android:paddingBottom="20dp"
+                            app:qmui_backgroundColor="@color/white"
+                            app:qmui_radius="@dimen/dp_4">
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:gravity="center_vertical"
+                                android:orientation="horizontal">
+
+                                <ImageView
+                                    android:id="@+id/iv_yellow"
+                                    android:layout_width="9dp"
+                                    android:layout_height="10dp"
+                                    android:layout_marginStart="18dp"
+                                    android:src="@drawable/ic_circle_yellow" />
+
+                                <TextView
+                                    android:layout_width="0dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_weight="1"
+                                    android:gravity="center"
+                                    android:text="@{vm.info.info.send[0].province.name+vm.info.info.send[0].city.name}"
+                                    android:textColor="@color/text_title"
+                                    android:textSize="@dimen/sp_15"
+                                    tools:text="山东 临沂"></TextView>
+
+                                <ImageView
+                                    android:layout_width="26dp"
+                                    android:layout_height="4dp"
+                                    android:src="@drawable/ic_long_arrow"></ImageView>
+
+
+                                <ImageView
+                                    android:id="@+id/iv_red"
+                                    android:layout_width="9dp"
+                                    android:layout_height="10dp"
+                                    android:layout_marginStart="14dp"
+                                    android:src="@drawable/ic_circle_red" />
+
+                                <TextView
+                                    android:id="@+id/tv_city_in"
+                                    android:layout_width="0dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginEnd="@dimen/dp_10"
+                                    android:layout_weight="1"
+                                    android:gravity="center"
+                                    android:text="@{vm.info.info.receive[vm.info.info.receive.size()-1].province.name+vm.info.info.receive[vm.info.info.receive.size()-1].city.name}"
+                                    android:textColor="@color/text_title"
+                                    android:textSize="@dimen/sp_15"
+                                    tools:text="河北 唐山"></TextView>
+
+
+                            </LinearLayout>
+
+                            <View
+                                android:layout_width="match_parent"
+                                android:layout_height="1dp"
+                                android:layout_marginStart="2dp"
+                                android:layout_marginTop="17dp"
+                                android:background="#E3E4E5" />
+
+
+                            <RelativeLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content">
+
+                                <androidx.recyclerview.widget.RecyclerView
+                                    android:id="@+id/recycler_view_out"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    tools:visibility="gone"
+                                    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                                    tools:listitem="@layout/item_peopleinfo">
+
+                                </androidx.recyclerview.widget.RecyclerView>
+                            </RelativeLayout>
+
+
+                            <View
+                                android:layout_width="match_parent"
+                                android:layout_height="1dp"
+                                android:layout_marginStart="2dp"
+                                android:layout_marginTop="24dp"
+                                android:background="#E3E4E5" />
+
+
+                            <RelativeLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content">
+
+
+                                <androidx.recyclerview.widget.RecyclerView
+                                    android:id="@+id/recycler_view_in"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    tools:visibility="gone"
+                                    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                                    tools:listitem="@layout/item_enterinfo" />
+
+                            </RelativeLayout>
+
+                        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+
+                        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="76dp"
+                            android:layout_marginStart="17dp"
+                            android:layout_marginTop="12dp"
+                            android:layout_marginEnd="16dp"
+                            android:gravity="center_vertical"
+                            android:orientation="horizontal"
+                            android:paddingStart="11dp"
+                            android:paddingEnd="26dp"
+                            android:visibility="@{vm.type==2?View.VISIBLE :View.GONE}"
+                            app:layout_goneMarginTop="@dimen/dp_10"
+                            app:qmui_backgroundColor="@color/white"
+                            app:qmui_radius="@dimen/dp_4">
+
+
+                            <ImageView
+                                android:layout_width="40dp"
+                                android:layout_height="40dp"
+                                android:layout_marginTop="21dp"
+                                android:layout_marginBottom="21dp"
+                                android:src="@drawable/bg_need_error" />
+
+                            <LinearLayout
+                                android:layout_width="0dp"
+                                android:layout_height="match_parent"
+                                android:layout_marginStart="8dp"
+                                android:layout_marginEnd="8dp"
+                                android:layout_weight="1"
+                                android:orientation="vertical">
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="16dp"
+                                    android:textColor="@color/text_title"
+                                    android:textSize="16sp"
+                                    android:textStyle="bold"
+                                    tools:text="临沂市昆仑物流有限公司" />
+
+
+                                <LinearLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="7dp"
+                                    android:orientation="horizontal">
+
+                                    <TextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginEnd="@dimen/dp_10"
+                                        android:text="累计交易"
+                                        android:textColor="#979899"
+                                        android:textSize="16sp" />
+
+                                    <TextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:textColor="#979899"
+                                        android:textSize="16sp"
+                                        tools:text="@string/single" />
+
+
+                                    <TextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginStart="@dimen/dp_10"
+                                        android:layout_marginEnd="@dimen/dp_10"
+                                        android:text="好评率"
+                                        android:textColor="#979899"
+                                        android:textSize="16sp" />
+
+                                    <TextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:textColor="#979899"
+                                        android:textSize="16sp"
+
+                                        tools:text="@string/percent_sign" />
+
+
+                                </LinearLayout>
+
+
+                            </LinearLayout>
+
+                            <LinearLayout
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:orientation="vertical">
+
+                                <ImageView
+                                    android:layout_width="24dp"
+                                    android:layout_height="24dp"
+                                    android:src="@drawable/ic_details_phone" />
+
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="4dp"
+                                    android:textColor="@color/text_title"
+                                    android:textSize="13sp"
+                                    tools:text="马勇" />
+
+
+                            </LinearLayout>
+
+
+                        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+
+                        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="76dp"
+                            android:layout_marginStart="17dp"
+                            android:layout_marginTop="12dp"
+                            android:layout_marginEnd="16dp"
+                            android:gravity="center_vertical"
+                            android:orientation="horizontal"
+                            android:paddingStart="11dp"
+                            android:paddingEnd="26dp"
+                            android:visibility="@{vm.type==0?View.VISIBLE :View.GONE}"
+                            app:layout_goneMarginTop="@dimen/dp_10"
+                            app:qmui_backgroundColor="@color/white"
+                            app:qmui_radius="@dimen/dp_4">
+
+
+                            <ImageView
+                                android:layout_width="40dp"
+                                android:layout_height="40dp"
+                                app:url="@{vm.info.driver.avatar}"
+                                android:src="@drawable/bg_need_error">
+
+                            </ImageView>
+
+                            <LinearLayout
+                                android:layout_width="0dp"
+                                android:layout_height="match_parent"
+                                android:layout_marginStart="8dp"
+                                android:layout_marginEnd="@dimen/dp_10"
+                                android:layout_weight="1"
+                                android:gravity="center"
+                                android:orientation="vertical">
+
+                                <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:textColor="@color/text_title"
+                                        android:textSize="@dimen/sp_14"
+                                        android:text="@{vm.info.driver.name}"
+                                        tools:text="乔治"></TextView>
+
+                                    <TextView
+                                        android:layout_width="0dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginStart="@dimen/dp_10"
+                                        android:layout_weight="1"
+                                        android:textColor="@color/text_title"
+                                        android:textSize="@dimen/sp_15"
+                                        android:text="@{vm.info.driver.mobile}"
+
+                                        tools:text="18535965350"></TextView>
+
+
+                                </LinearLayout>
+
+                                <LinearLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="6dp"
+                                    android:orientation="horizontal">
+
+                                    <TextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:textColor="#979899"
+                                        android:textSize="@dimen/sp_13"
+                                        tools:text="鲁QAA888"></TextView>
+
+                                    <TextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginStart="@dimen/dp_10"
+                                        android:layout_marginEnd="@dimen/dp_10"
+                                        android:text="/"
+                                        android:textColor="#979899"
+                                        android:textSize="@dimen/sp_13"></TextView>
+
+                                    <TextView
+                                        android:layout_width="0dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_weight="1"
+                                        android:textColor="#979899"
+                                        android:textSize="@dimen/sp_13"
+                                        tools:text="平板车 13米"></TextView>
+
+
+                                </LinearLayout>
+
+
+                            </LinearLayout>
+
+                            <ImageView
+                                android:layout_width="24dp"
+                                android:layout_height="24dp"
+                                android:layout_marginEnd="16dp"
+                                tools:src="@drawable/ic_star_off_to"
+                                android:src="@{vm.info.driver.is_collect==1?@drawable/ic_star_on:@drawable/ic_star_off_to}">
+
+                            </ImageView>
+
+                            <ImageView
+                                android:layout_width="24dp"
+                                android:layout_height="24dp"
+                                android:onClick="@{v->vm.toCallPhone(vm.info.driver.mobile)}"
+                                android:src="@drawable/ic_details_phone">
+
+                            </ImageView>
+
+
+                        </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="@dimen/dp_10"
+                            android:layout_marginEnd="16dp"
+                            android:orientation="vertical"
+                            android:paddingStart="21dp"
+                            android:paddingTop="20dp"
+                            android:paddingEnd="16dp"
+                            android:paddingBottom="18dp"
+                            app:qmui_backgroundColor="@color/white"
+                            app:qmui_borderColor="@color/white"
+                            app:qmui_radius="@dimen/dp_4">
+
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="@dimen/dp_10"
+                                android:gravity="center_vertical"
+                                android:orientation="horizontal">
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="运单号"
+                                    android:textColor="#767778"
+                                    android:textSize="@dimen/sp_14" />
+
+                                <TextView
+
+                                    android:layout_width="0dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_weight="1"
+                                    android:gravity="right"
+                                    android:text="@{vm.info.order.order_sn}"
+                                    android:textColor="@color/text_title"
+                                    android:textSize="@dimen/sp_13"
+                                    tools:text="电话:1835399999"></TextView>
+
+
+                            </LinearLayout>
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="12dp"
+                                android:gravity="center_vertical"
+                                android:orientation="horizontal"
+                                >
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="运单状态"
+                                    android:textColor="#767778"
+                                    android:textSize="@dimen/sp_14" />
+
+
+                                <TextView
+                                    android:layout_width="0dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_weight="1"
+                                    android:gravity="right"
+                                    tools:text="进行中"
+                                    android:text="@{vm.getOrderStatus(vm.info.order.order_state)}"
+                                    android:textColor="@color/text_title"
+                                    android:textSize="@dimen/sp_13"
+                                    ></TextView>
+
+
+                            </LinearLayout>
+
+
+
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="@dimen/dp_14"
+                                android:gravity="center_vertical"
+                                android:orientation="horizontal">
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="车型车长"
+                                    android:textColor="#767778"
+                                    android:textSize="@dimen/sp_14" />
+
+
+                                <TextView
+                                    android:layout_width="0dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_weight="1"
+                                    android:gravity="right"
+                                    android:text="@{vm.info.info.type_info.type_name+@string/spot+vm.info.info.type_info.length+@string/rice}"
+                                    android:textColor="@color/text_title"
+                                    android:textSize="@dimen/sp_14"
+                                    tools:text="电话:1835399999"></TextView>
+
+
+                            </LinearLayout>
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="@dimen/dp_13"
+                                android:gravity="center_vertical"
+                                android:orientation="horizontal">
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="备注"
+                                    android:textColor="#767778"
+                                    android:textSize="@dimen/sp_14" />
+
+
+                                <TextView
+
+                                    android:layout_width="0dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_weight="1"
+                                    android:gravity="right"
+                                    android:text="@{vm.info.info.data}"
+                                    android:textColor="@color/text_title"
+                                    android:textSize="@dimen/sp_14"
+                                    tools:text="电话:1835399999"></TextView>
+
+
+                            </LinearLayout>
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="13dp"
+                                android:gravity="center_vertical"
+                                android:orientation="horizontal">
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="纸质回单"
+                                    android:textColor="#767778"
+                                    android:textSize="@dimen/sp_14" />
+
+
+                                <TextView
+                                    android:layout_width="0dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_weight="1"
+                                    android:gravity="right"
+                                    android:textColor="@color/text_title"
+                                    android:textSize="@dimen/sp_14"
+                                    tools:text="电话:1835399999"></TextView>
+
+
+                            </LinearLayout>
+
+
+                        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+
+                        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="50dp"
+                            android:layout_marginStart="@dimen/dp_17"
+                            android:layout_marginTop="@dimen/dp_12"
+                            android:layout_marginEnd="@dimen/dp_16"
+                            android:layout_marginBottom="9dp"
+                            android:gravity="center"
+                            android:orientation="vertical"
+                            android:paddingStart="21dp"
+                            android:paddingEnd="16dp"
+                            app:layout_goneMarginTop="@dimen/dp_10"
+                            app:qmui_backgroundColor="@color/white"
+                            app:qmui_radius="@dimen/dp_4">
+
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:gravity="center_vertical"
+                                android:orientation="horizontal">
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="运费"
+                                    android:textColor="#767778"
+                                    android:textSize="@dimen/sp_14"></TextView>
+
+                                <TextView
+                                    android:layout_width="0dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_weight="1"
+                                    android:gravity="right"
+                                    android:text="@{@string/total_img+vm.info.info.total}"
+                                    android:textColor="@color/text_title"
+                                    android:textSize="@dimen/sp_14"
+                                    tools:text="￥30000"></TextView>
+
+
+                            </LinearLayout>
+
+                        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+
+                        <FrameLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="16dp"
+                            android:layout_marginEnd="@dimen/dp_16"
+                            android:visibility="@{vm.isButShow?View.VISIBLE:View.GONE}"
+                            android:onClick="@{v->vm.toStartShip(vm.info.order.order_id)}"
+                           >
+
+                            <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="@{vm.tvTitle}"
+                                android:textColor="@color/white"
+                                android:textSize="16sp">
+
+                            </TextView>
+
+                        </FrameLayout>
+
+
+                    </LinearLayout>
+                </ScrollView>
+
+
+
+            </LinearLayout>
+
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="#80000000"
+                android:gravity="center"
+                tools:visibility="gone"
+                android:visibility="@{vm.isDialogShow?View.VISIBLE:View.GONE}"
+                android:onClick="@{v->vm.interceptClick()}"
+                android:orientation="vertical">
+
+
+                <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="27dp"
+                    android:layout_marginEnd="27dp"
+                    android:orientation="vertical"
+                    app:qmui_backgroundColor="@color/white"
+                    app:qmui_borderColor="@color/white"
+                    app:qmui_radius="8dp">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="20dp"
+                        android:layout_marginTop="36dp"
+                        android:layout_marginEnd="20dp"
+                        android:layout_marginBottom="24dp"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="输入运送数量"
+                            android:textColor="#000000"
+                            android:textSize="17sp"
+                            android:textStyle="bold" />
+
+                        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="40dp"
+                            android:layout_marginStart="10dp"
+                            android:gravity="center_vertical"
+                            app:qmui_backgroundColor="#F4F5F6"
+                            app:qmui_borderColor="#F4F5F6"
+                            app:qmui_radius="4dp">
+
+
+                            <com.ysnows.base.widget.DelEditText
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:background="@null"
+                                android:hint="请输入要实际送达数量"
+                                android:textColor="#26292F"
+                                android:text="@={vm.number}"
+                                android:paddingStart="15dp"
+                                android:textColorHint="#979899"
+                                android:textSize="@dimen/sp_13" />
+
+                        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="20dp"
+                        android:layout_marginBottom="4dp"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="凭证"
+                            android:textColor="#000000"
+                            android:textSize="17sp"
+                            android:textStyle="bold" />
+
+
+                        <ImageView
+                            android:layout_width="57dp"
+                            android:layout_height="59dp"
+                            android:layout_marginStart="18dp"
+                            android:scaleType="fitXY"
+                            android:onClick="@{v->vm.choseImg()}"
+                            app:url="@{vm.img}"
+                            android:src="@drawable/ic_chose_img" />
+
+                    </LinearLayout>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="68dp"
+                        android:layout_marginBottom="25dp"
+                        android:text="（上传照片）"
+                        android:textColor="#9D9D9D"
+                        android:textSize="11dp">
+
+                    </TextView>
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="1dp"
+                        android:background="#E3E4E5" />
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:layout_marginTop="15dp"
+                            android:layout_marginBottom="17dp"
+                            android:gravity="center"
+                            android:onClick="@{v->vm.goOperation(1,vm.info.order.order_id,vm.info.info.send[0].data_id)}"
+                            android:text="取消"
+                            android:textColor="#26292F"
+                            android:textSize="17sp" />
+
+                        <View
+                            android:layout_width="1dp"
+                            android:layout_height="match_parent"
+                            android:background="#E3E4E5" />
+
+                        <TextView
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="15dp"
+                            android:layout_marginBottom="17dp"
+                            android:layout_weight="1"
+                            android:onClick="@{v->vm.goOperation(2,vm.info.order.order_id,vm.info.info.send[0].data_id)}"
+                            android:gravity="center"
+                            android:text="确定"
+                            android:textColor="#FFBC00"
+                            android:textSize="17sp" />
+
+
+                    </LinearLayout>
+
+
+                </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+
+            </LinearLayout>
+
+
+        </FrameLayout>
+
+
+    </LinearLayout>
+</layout>

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

@@ -28,7 +28,7 @@
             android:layout_height="match_parent"
             android:paddingStart="12dp"
             android:paddingEnd="13dp"
-            android:onClick="@{v->vm.gotoInfoDetails(item.info_id)}"
+            android:onClick="@{v->vm.gotoInfoDetails(item.order_id)}"
             android:paddingBottom="18dp" >
 
             <TextView

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

@@ -1,8 +1,14 @@
 <?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>
+        <import type="android.view.View" />
+
+        <variable
+            name="vm"
+            type="com.quansu.heifengwuliu.vmodel.VehicleListVModel" />
 
         <variable
             name="item"
@@ -10,22 +16,26 @@
 
     </data>
 
-    <LinearLayout xmlns:app="http://schemas.android.com/apk/res-auto"
+    <LinearLayout
         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:layout_marginStart="17dp"
+        android:layout_marginTop="12dp"
+        android:onClick="@{v->vm.goDetails(item.order_id)}"
+        android:layout_marginEnd="16dp"
         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"
+            android:paddingStart="13dp"
+            android:paddingTop="11dp"
+            android:paddingEnd="14dp"
+            android:paddingBottom="14dp"
+            app:qmui_backgroundColor="@color/white"
+            app:qmui_borderColor="@color/white"
             app:qmui_radius="@dimen/dp_4">
 
             <LinearLayout
@@ -33,29 +43,36 @@
                 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" />
+                    android:text="@{item.create_time}"
+                    android:textColor="#767778"
+                    android:textSize="@dimen/sp_14"
+                    tools:text="2020-09-15 11:30:10" />
 
                 <TextView
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
                     android:ellipsize="end"
                     android:maxLines="1"
-                    android:textColor="#67ACEE"
-                    android:textSize="@dimen/sp_16"
+                    android:text="@{vm.getOrderStatus(item.order_state)}"
+                    android:textColor="#FFBC00"
+                    android:textSize="@dimen/sp_14"
                     tools:text="@string/app_name" />
 
             </LinearLayout>
 
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="9dp"
+                android:layout_marginBottom="18dp"
+                android:background="#E3E4E5" />
+
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -74,25 +91,32 @@
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/dp_10"
+                        android:gravity="center_vertical"
                         android:orientation="horizontal">
 
+                        <ImageView
+                            android:layout_width="22dp"
+                            android:layout_marginEnd="11dp"
+                            android:src="@drawable/ic_car_number"
+                            android:layout_height="14dp"/>
+
+
 
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="车牌号："
                             android:textColor="@color/text_title"
-                            android:textSize="@dimen/sp_16"
+                            android:textSize="@dimen/sp_15"
                             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:text="@{item.number}"
                             android:textColor="@color/text_title"
-                            android:textSize="@dimen/sp_16"
+                            android:textSize="@dimen/sp_15"
                             tools:text="@string/app_name" />
 
                     </LinearLayout>
@@ -100,39 +124,48 @@
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/dp_10"
+                        android:layout_marginTop="9dp"
                         android:orientation="horizontal">
 
+                        <ImageView
+                            android:layout_width="21dp"
+                            android:layout_marginEnd="12dp"
+                            android:src="@drawable/ic_car_owner"
+                            android:layout_height="18dp"/>
 
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="张三"
+                            android:text="@{item.name}"
                             android:textColor="@color/text_title"
-                            android:textSize="@dimen/sp_16"
+                            android:textSize="@dimen/sp_15"
                             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:text="@{item.mobile}"
                             android:textColor="@color/text_title"
-                            android:textSize="@dimen/sp_16"
+                            android:textSize="@dimen/sp_15"
                             tools:text="@string/app_name" />
 
                     </LinearLayout>
                 </LinearLayout>
 
                 <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-                    android:layout_width="120dp"
-                    android:layout_height="40dp"
+                    android:layout_width="66dp"
+                    android:layout_height="34dp"
                     android:text="去结算"
+                    android:visibility="@{item.order_state==30?View.VISIBLE:View.GONE}"
                     android:textColor="@color/white"
-                    android:textSize="@dimen/sp_15"
-                    app:qmui_backgroundColor="#E17E30"
-                    app:qmui_borderColor="#E17E30"
-                    app:qmui_radius="@dimen/dp_4" />
+                    android:textSize="@dimen/sp_13"
+                    app:qmui_backgroundColor="#FFBC00"
+                    app:qmui_borderColor="#FFBC00"
+                    app:qmui_radius="17dp"
+                    app:qmui_shadowAlpha="0.56"
+                    app:qmui_shadowElevation="7dp"
+                    />
 
 
             </LinearLayout>

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

@@ -198,7 +198,7 @@
                 android:layout_marginStart="30dp"
                 android:hint="点击选择装货时间"
                 android:textColor="@color/text_title"
-                android:textColorHint="#26292F"
+                android:textColorHint="#979899"
                 android:textSize="@dimen/sp_16"></TextView>
 
             <LinearLayout

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

@@ -494,8 +494,7 @@ Api 已达到使用限制
     <string name="withdrawal_amount">可提现金额</string>
     <string name="comma">,</string>
     <string name="cargo_volume">载货体积:</string>
-
-
+    <string name="receiving_vehicle">接单车辆</string>
 
 
 </resources >