1.司机端取货+送达。

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

@@ -66,8 +66,8 @@ class HomeActivity : MBActivity<HomeVModel, ActivityHomeBinding>() {
 
     private fun initMainMenu(type: Int) {
         val menuTabBuilder = binding.mainMenu.tabBuilder()
-                .setSelectColor(Color.parseColor("#2E4E71"))
-                .setNormalColor(Color.parseColor("#666666"))
+                .setSelectColor(Color.parseColor("#FFBC00"))
+                .setNormalColor(Color.parseColor("#767778"))
 
         binding.mainMenu.clear()
 
@@ -108,14 +108,14 @@ class HomeActivity : MBActivity<HomeVModel, ActivityHomeBinding>() {
 
             val one = menuTabBuilder
                     .setFragment(oneFragment)
-                    .setNormalDrawable(ContextCompat.getDrawable(context(), R.drawable.menu_index))
-                    .setSelectedDrawable(ContextCompat.getDrawable(context(), R.drawable.menu_index_focus))
-                    .setText(getString(R.string.home))
+                    .setNormalDrawable(ContextCompat.getDrawable(context(), R.drawable.menu_one))
+                    .setSelectedDrawable(ContextCompat.getDrawable(context(), R.drawable.menu_one_focus))
+                    .setText(getString(R.string.deliver_goods))
                     .build(context())
             val two = menuTabBuilder
                     .setFragment(twoFragment)
-                    .setNormalDrawable(ContextCompat.getDrawable(context(), R.drawable.menu_vehicle))
-                    .setSelectedDrawable(ContextCompat.getDrawable(context(), R.drawable.menu_vehicle_focus))
+                    .setNormalDrawable(ContextCompat.getDrawable(context(), R.drawable.menu_two))
+                    .setSelectedDrawable(ContextCompat.getDrawable(context(), R.drawable.menu_two_focus))
                     .setText(getString(R.string.source_information))
                     .build(context())
             val three = menuTabBuilder

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

@@ -1,27 +1,33 @@
 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>() {
-    var type=1//0运单详情（显示运输轨迹按钮，下一步按钮） 1 货源详情（取消发布 再来一单 接单车辆）
+class SourceDetailsActivity: MBActivity<SourceDetailsVModel, ActivitySourcedetailsBinding>(), OnUploadCallback<String> {
+    var type=1//0运单详情-货主端（显示运输轨迹按钮，下一步按钮） 1 货源详情-货主端（取消发布 再来一单 接单车辆）  2运单详情-司机端
 
     override fun __before() {
         super.__before()
-        var type=intent?.extras?.getInt("type", 1)
-
+         type= intent?.extras?.getInt("type", 1)!!
 
     }
 
@@ -40,7 +46,7 @@ class SourceDetailsActivity: MBActivity<SourceDetailsVModel, ActivitySourcedetai
         vm.info.observe(this, Observer {
             //观察
             initViewPager(vm.info.value!!)
-            if(vm.info.value!!.order.info_state==10) {//弹支付框
+            if(vm.info.value!!.order.info_state==10&&type!=2) {//弹支付框
                 vm.showPayDialog(info_id!!, binding.ll)
             }
 
@@ -57,7 +63,7 @@ class SourceDetailsActivity: MBActivity<SourceDetailsVModel, ActivitySourcedetai
        var  outList = bean.order.send
        adapterOut!!.addData(outList)
        //入
-       var adapterIn= OrderInfoInadapter(bean.order.type)
+       var adapterIn= OrderInfoInadapter()
        binding.recyclerViewIn.adapter=adapterIn
        var  inList = bean.order.receive
        adapterIn!!.addData(inList)
@@ -80,6 +86,50 @@ class SourceDetailsActivity: MBActivity<SourceDetailsVModel, ActivitySourcedetai
     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/VehicleInfoActivity.kt

@@ -3,13 +3,16 @@ 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.qmuiteam.qmui.kotlin.onClick
 import com.quansu.heifengwuliu.base.MBActivity
 import com.quansu.heifengwuliu.config.MIntentAction
 import com.quansu.heifengwuliu.databinding.ActivityVehicleInfoBinding
 import com.quansu.heifengwuliu.inte.ChoiceData
+import com.quansu.heifengwuliu.inte.ChoiceListData
 import com.quansu.heifengwuliu.inte.OnUploadCallback
+import com.quansu.heifengwuliu.model.SelectData
 import com.quansu.heifengwuliu.utils.OssUtils
 import com.quansu.heifengwuliu.utils.PopuListUtils
 import com.quansu.heifengwuliu.vmodel.VehicleInfoVModel
@@ -22,15 +25,22 @@ import java.util.ArrayList
 class VehicleInfoActivity: MBActivity<VehicleInfoVModel, ActivityVehicleInfoBinding>(), OnUploadCallback<String> {
 
     //颜色
-    var colorList = ArrayList<String>()
+    var colorList = ArrayList<SelectData>()
+    //车辆类型代码
+    var carCateList = ArrayList<SelectData>()
+    //车辆能源
+    var carEnergy = ArrayList<SelectData>()
+    //车型车长
+    var carTypeList=ArrayList<SelectData>()
 
 
     override fun listeners() {
         super.listeners()
         binding.llColor.onClick {
             //选择颜色
-            PopuListUtils.showQMUIPopup(context(), binding.llColor, colorList, object : ChoiceData {
-                override fun onRestuse(name: String?) {
+            PopuListUtils.showQMUIPopup(context(), binding.llColor, colorList, object : ChoiceListData {
+                override fun onRestuse(code: String?,name: String?) {
+                    vm.color_code= code.toString()
                     vm.color.value = name
 
                 }
@@ -38,27 +48,61 @@ class VehicleInfoActivity: MBActivity<VehicleInfoVModel, ActivityVehicleInfoBind
         }
         binding.llCarType.onClick {
             //车长车型
+            PopuListUtils.showQMUIPopup(context(), binding.llCarType, carTypeList, object : ChoiceListData {
+                override fun onRestuse(code: String?,name: String?) {
+                    vm.carType_code= code.toString()
+                    vm.carType.value = name
 
+                }
+            })
+        }
+
+        binding.llCarCate.onClick {
+            PopuListUtils.showQMUIPopup(context(), binding.llCarCate, carCateList, object : ChoiceListData {
+                override fun onRestuse(code: String?,name: String?) {
+                    vm.carCate_code= code.toString()
+                    vm.carCate.value = name
+
+                }
+            })
+        }
+        binding.llCarEnergy.onClick {
+            PopuListUtils.showQMUIPopup(context(), binding.llCarEnergy, carEnergy, object : ChoiceListData {
+                override fun onRestuse(code: String?,name: String?) {
+                    vm.carEnergy_code= code.toString()
+                    vm.carEnergy.value = name
+
+                }
+            })
         }
+
+
+
     }
 
     override fun initCreate(savedInstanceState: Bundle?) {
         super.initCreate(savedInstanceState)
-        initData()
         vm.getInfo()
-    }
+        //监听数据
+        vm.info.observe(this, Observer {
+            if (null == it) {
+                return@Observer
+            }
+            var info=it
+            colorList= it.color_z as ArrayList<SelectData>
+            carCateList=it.car_cate_z as ArrayList<SelectData>
+            carEnergy=it.car_energy_z as ArrayList<SelectData>
+            carTypeList=it.car_type_z as ArrayList<SelectData>
+
+
+        })
 
 
-    private fun initData(){
-        colorList.add("黄色")
-        colorList.add("白色")
-        colorList.add("银色")
-        colorList.add("蓝色")
-        colorList.add("黑色")
-        colorList.add("红色")
-        colorList.add("其他")
     }
 
+
+
+
     override fun binding(): ActivityVehicleInfoBinding {
        return ActivityVehicleInfoBinding.inflate(layoutInflater)
     }

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

@@ -6,10 +6,10 @@ import com.quansu.heifengwuliu.databinding.ItemEnterinfoBinding
 import com.quansu.heifengwuliu.model.DataInfoBean
 import com.ysnows.base.base.BAdapter
 
-class OrderInfoInadapter(val type:Int) : BAdapter<DataInfoBean.OrderBean.ReceiveBean, BaseDataBindingHolder<ItemEnterinfoBinding>>(R.layout.item_enterinfo) {
+class OrderInfoInadapter() : BAdapter<DataInfoBean.OrderBean.ReceiveBean, BaseDataBindingHolder<ItemEnterinfoBinding>>(R.layout.item_enterinfo) {
 
     override fun convert(holder: BaseDataBindingHolder<ItemEnterinfoBinding>, item: DataInfoBean.OrderBean.ReceiveBean) {
-         holder.dataBinding?.type=type
+        holder.dataBinding?.position=holder.adapterPosition
         holder.dataBinding?.item = item
     }
 }

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

@@ -1,10 +1,13 @@
 package com.quansu.heifengwuliu.fragment
 
+import android.app.Activity
+import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import com.quansu.heifengwuliu.adapter.DriverOrderListAdapter
 import com.quansu.heifengwuliu.base.MBRFragment
+import com.quansu.heifengwuliu.config.MIntentAction
 import com.quansu.heifengwuliu.databinding.FragmentDriverOrderListBinding
 import com.quansu.heifengwuliu.vmodel.DriverOrderListVModel
 
@@ -16,6 +19,11 @@ class DriverOrderListFragment : MBRFragment<DriverOrderListVModel, DriverOrderLi
         vm.infoState = arguments?.getString("info_state")
     }
 
+    override fun init(savedInstanceState: Bundle?) {
+        super.init(savedInstanceState)
+        vm.fragment=this
+    }
+
     override fun initAdapter(): DriverOrderListAdapter {
         return DriverOrderListAdapter(vm)
     }
@@ -32,4 +40,12 @@ class DriverOrderListFragment : MBRFragment<DriverOrderListVModel, DriverOrderLi
     override fun vmClass(): Class<DriverOrderListVModel> {
         return DriverOrderListVModel::class.java
     }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        if (MIntentAction.REQUEST_CODE_ONE == requestCode && resultCode == Activity.RESULT_OK) {
+            //刷新列表
+            onRefresh()
+        }
+    }
 }

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

@@ -45,28 +45,34 @@ class DriverWayBillFragment : MBTabFragment<BViewModel<BRepository>, FragmentWay
                 return ownerFragment
             }
             1 -> {
-                ownerFragment.arguments = B().putString("info_state", "20").ok()
+                ownerFragment.arguments = B().putString("info_state", "10").ok()
                 return ownerFragment
 
             }
             2 -> {
-                ownerFragment.arguments = B().putString("info_state", "30").ok()
+                ownerFragment.arguments = B().putString("info_state", "20").ok()
                 return ownerFragment
 
             }
             3 -> {
-                ownerFragment.arguments = B().putString("info_state", "40").ok()
+                ownerFragment.arguments = B().putString("info_state", "30").ok()
                 return ownerFragment
 
             }
             4 -> {
                 var ownerFragment = OrderListFragment()
-                ownerFragment.arguments = B().putString("info_state", "100").ok()
+                ownerFragment.arguments = B().putString("info_state", "40").ok()
                 return ownerFragment
 
             }
+
+            5->{
+                var ownerFragment = OrderListFragment()
+                ownerFragment.arguments = B().putString("info_state", "50").ok()
+                return ownerFragment
+            }
             else->{
-                ownerFragment.arguments = B().putString("info_state", "0").ok()
+                ownerFragment.arguments = B().putString("info_state", "50").ok()
                 return ownerFragment
             }
 
@@ -75,7 +81,7 @@ class DriverWayBillFragment : MBTabFragment<BViewModel<BRepository>, FragmentWay
     }
 
     override fun getPageCount(): Int {
-        return 5
+        return 6
     }
 
     override fun createTabs(tabBuilder: QMUITabBuilder): Array<QMUITab> {
@@ -95,11 +101,15 @@ class DriverWayBillFragment : MBTabFragment<BViewModel<BRepository>, FragmentWay
                 .setText(getString(R.string.to_settled))
                 .build(context())
 
+        val evaluate = tabBuilder
+                .setText(getString(R.string.to_evaluate))
+                .build(context())
+
         val completed = tabBuilder
                 .setText(getText(R.string.completed))
                 .build(context())
 
-        return arrayOf(component, util, ongoing, canceled, completed)
+        return arrayOf(component, util, ongoing, canceled,evaluate, completed)
 
     }
 

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

@@ -12,8 +12,13 @@ import com.ysnows.base.inter.IModel
  * type：1一装一卸  2一装多卸
  */
 data class DataInfoBean(var goods_type: List<SelectData>, var nums_type: List<String>,
-                        var car_type: List<CarTypeBean>, var order: OrderBean,var default_send:DefaultSdendBean,
-                      var default_receive:DefaultReceiveBean) : IModel {
+                        var car_type: List<CarTypeBean>, var order: OrderBean,
+                        var default_send:DefaultSdendBean,
+                         var default_receive:DefaultReceiveBean,
+                         var company: CompanyBean,
+                        var user_order:UserOrderBean
+
+        ) : IModel {
 
 
 
@@ -110,4 +115,15 @@ data class DataInfoBean(var goods_type: List<SelectData>, var nums_type: List<St
 
 
     }
+
+    data class CompanyBean(var company_name: String,var info_nums: String,var name: String,
+                           var mobile: String,var good: String,var hpl: String):IModel{
+
+    }
+
+    data class UserOrderBean(var order_id:String,var order_sn:String,
+                             var order_state:Int,var money:String
+    ):IModel{
+
+    }
 }

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

@@ -19,7 +19,7 @@ class InfoBean(var info_id: String, var uid: String,
 
                var driver_img: String, var driving_z: String, var driving_f: String,
                var tonnage: Int, var license_dl: String, var license_cy: String,
-               var car_type: String, var car_load: String,
+               var car_type: CarTypeBean, var car_load: String,
                var car_brand: String, var driving_sn: String, var car_weight: String,
                var car_size_l: String, var car_size_h: String, var car_size_w: String,
                var car_own: String,
@@ -27,9 +27,17 @@ class InfoBean(var info_id: String, var uid: String,
                var reg_date: String, var cert_date: String, var driver_org: String,
                var start_date: String, var end_date: String,
                var reason: String, var color: ColorBean, var car_cate: CarCateBean,
-               var car_energy: carEnergyBean
+               var car_energy: carEnergyBean,
+               var car_type_z:List<SelectData>,
+               var color_z:List<SelectData>,var car_cate_z:List<SelectData>,
+               var car_energy_z:List<SelectData>
 ) : IModel {
 
+
+    data class CarTypeBean(var code: String, var name: String): IModel{
+
+    }
+
     data class ColorBean(var code: String, var name: String) : IModel {
 
     }

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

@@ -8,7 +8,7 @@ import com.ysnows.base.inter.IModel
  *Created by shihuiyun
  *on 2020/9/14
  *货主端： 订单状态 info_state：10->待支付  20->待接单  30->进行中 40-> 已完成  100->已取消
- *
+ *司机端： 订单状态 order_state：0->全部 10->待取货 20->运输中 30->待结算 40->待评价 50->已完成
  */
 data class InfoListBean(var info_id: String, var info_state: Int,
                         var info_sn: String, var is_pay: String,
@@ -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 company_name:String,var order_state:Int
 ) : IModel {
 
     data class TypeInfoBean(var type_id: String,var type_name: String, @SerializedName("long") var longx: String,

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

@@ -1,84 +0,0 @@
-package com.quansu.heifengwuliu.model
-
-import com.google.gson.annotations.SerializedName
-import com.ysnows.base.inter.IModel
-
-/**
- *Created by shihuiyun
- *on 2020/9/21
- */
-data class SourceDetails(var info:InfoBean,var company:CompanyBean ): IModel {
-
-    data class InfoBean(var info_id: String, var info_state: Int,
-                        var info_sn: String,var type_id:String, var is_pay: String,
-                        var uid: String, var price: String,
-                        var total: String,var all_total:String,
-                        var nums: String, var is_public: String,
-                        var driver: List<String>,
-                        var is_insurance: String, var type: Int,
-                        var data: String, var pay_time: String,
-                        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{
-
-        data class TypeInfoBean(var type_id: String, var type_name: String, @SerializedName("long") var longx: String,
-
-                                ): IModel{
-        }
-        data class ReceiveBean(var data_id: String, var info_id: String, var lat: String,
-                               var lng: String, var address: String, var name: String, var mobile: String, var goods: String,
-                               var goods_type: GoodsTypeBean, var nums: String, var nums_type: NumsTypeBean, var price: String, var total: String,
-                               var time: String, var type: String, var create_time: String, var update_time: String, var delete_time: String,
-                               var province: ProvinceBean, var city: CityBean, var area: AreaBean
-        ) : IModel {
-            data class ProvinceBean(var name: String, var code: String) : IModel {
-
-            }
-
-            data class CityBean(var name: String, var code: String) : IModel {
-
-            }
-
-            data class AreaBean(var name: String, var code: String) : IModel {
-
-            }
-
-            data class GoodsTypeBean(var name: String, var code: String) : IModel {
-
-            }
-
-            data class NumsTypeBean(var name: String, var code: String) : IModel {
-
-            }
-
-
-        }
-
-        data class SendBean(var data_id: String, var info_id: String, var lat: String,
-                            var lng: String, var address: String, var name: String, var mobile: String,
-                            var time: String, var type: String,
-                            var province: ProvinceBean, var city: CityBean, var area: AreaBean
-        ) : IModel {
-
-            data class ProvinceBean(var name: String, var code: String) : IModel {
-
-            }
-
-            data class CityBean(var name: String, var code: String) : IModel {
-
-            }
-
-            data class AreaBean(var name: String, var code: String) : IModel {
-
-            }
-
-        }
-
-    }
-    data class CompanyBean(var company_name: String,var info_nums: String,var name: String,
-                           var mobile: String,var good: String,var hpl: String):IModel{
-
-    }
-}

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

@@ -389,7 +389,7 @@ interface ApiService {
      * @return
      */
     @GET("api/order/infoGet")
-    fun infoGetDriver(@Query("info_id") info_id: String?): Observable<Response<SourceDetails>>
+    fun infoGetDriver(@Query("info_id") info_id: String?): Observable<Response<DataInfoBean>>
 
 
 
@@ -402,7 +402,21 @@ interface ApiService {
 
 
 
+    /**
+     * 我的运单-司机端
+     * @return
+     */
+    @GET("api/order/myList")
+    fun myList(@Query("order_state") order_state: String?, @Query("p") p: Int): Observable<Response<List<InfoListBean>>>
+
 
+    /**
+     * 抢单-司机端
+     * @return
+     */
+    @FormUrlEncoded
+    @POST("api/order/setStatus")
+    fun setStatus( @FieldMap params: HashMap<String, String>): Observable<Response<Any>>
 
 
     /**
@@ -443,4 +457,9 @@ interface ApiService {
     @GET("api/wxocr/cv_driving")
     fun cvDriving(@Query("img") img: String?): Observable<Response<CvDriving>>
 
+
+
+
+
+
 }

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

@@ -15,9 +15,12 @@ class Response<D>(
     override fun ok(showError: Boolean): Boolean {
         val ok = status == 1
 
-        if (showError && !ok) {
+//        if (showError && !ok) {
+//            Toasts.toast(BApp.instance(), msg())
+//        }
+        if (showError) {//状态成功的时候也可以提示
             Toasts.toast(BApp.instance(), msg())
-        }
+         }
         return ok
     }
 

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

@@ -2,6 +2,8 @@ package com.quansu.heifengwuliu.vmodel
 
 import android.os.Bundle
 import com.quansu.heifengwuliu.activity.SourceDetailsActivity
+import com.quansu.heifengwuliu.config.MIntentAction
+import com.quansu.heifengwuliu.fragment.DriverOrderListFragment
 import com.quansu.heifengwuliu.utils.net.NetEngine
 import com.ysnows.base.base.BRRepository
 import com.ysnows.base.base.BRViewModel
@@ -14,16 +16,17 @@ import java.util.ArrayList
 
 class DriverOrderListVModel : BRViewModel<BRRepository>() {
 
+    var fragment: DriverOrderListFragment? =null
 
     var infoState: String? = null
 
     fun getOrderStatus(status: Int): String {
         return when (status) {
-            10 -> "待支付"
-            20 -> "待接单"
-            30 -> "进行中"
-            40 -> "已完成"
-            40 -> "已取消"
+            10 -> "待取货"
+            20 -> "运输中"
+            30 -> "待结算"
+            40 -> "待评价"
+            50 -> "已完成"
             else -> ""
         }
 
@@ -31,17 +34,17 @@ class DriverOrderListVModel : BRViewModel<BRRepository>() {
 
     fun gotoInfoDetails(info_id: String) {
         //到详情界面
-        UiSwitch.bundle(repository().context, SourceDetailsActivity::class.java, Bundle().apply {
+        UiSwitch.bundleRes(fragment, SourceDetailsActivity::class.java, Bundle().apply {
             putString("info_id", info_id)
-            putInt("type", 1)
-            putInt("again", 1)
-        })
+            putInt("type", 2)
+            putInt("again", 0)
+        },MIntentAction.REQUEST_CODE_ONE)
 
 
     }
 
     override fun api(): Observable<out IResponse<*>> {
-        return NetEngine.service.infoList(infoState, repository().autoPage())
+        return NetEngine.service.myList(infoState, repository().autoPage())
     }
 
 

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

@@ -9,7 +9,7 @@ import android.text.TextUtils
 import androidx.lifecycle.MutableLiveData
 import com.qmuiteam.qmui.widget.dialog.QMUIDialog
 import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction
-import com.quansu.heifengwuliu.model.SourceDetails
+import com.quansu.heifengwuliu.model.DataInfoBean
 import com.quansu.heifengwuliu.utils.net.NetEngine
 import com.yanzhenjie.permission.Action
 import com.yanzhenjie.permission.AndPermission
@@ -22,14 +22,14 @@ import com.ysnows.base.base.BViewModel
  */
 open class GrabDetailsVModel: BViewModel<BRepository>() {
 
-    val info: MutableLiveData<SourceDetails> = MutableLiveData<SourceDetails>()
+    val info: MutableLiveData<DataInfoBean> = MutableLiveData<DataInfoBean>()
 
     fun getInfo(info_id: String) {
         repository().preq(NetEngine.service.infoGetDriver(info_id))
                 .doOnNext() {
                     if (it.ok()) {
 
-                        info.value = it.data() as SourceDetails
+                        info.value = it.data() as DataInfoBean
 
                     }
                 }

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

@@ -1,12 +1,18 @@
 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.LinearLayout
+import androidx.databinding.Bindable
 import androidx.lifecycle.MutableLiveData
 import com.google.gson.Gson
 import com.hwangjr.rxbus.RxBus
@@ -15,41 +21,93 @@ 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.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
+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
 
 
 open class SourceDetailsVModel : BViewModel<BRepository>() {
 
     val info: MutableLiveData<DataInfoBean> = MutableLiveData<DataInfoBean>()
 
-    //0运单详情（显示运输轨迹按钮，下一步按钮） 1 货源详情（取消发布 再来一单 接单车辆）
+    //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
+    var number: String? = null
+        set(value) {
+            field = value
+            notifyPropertyChanged(BR.number)
+        }
 
     fun getInfo(info_id: String) {
-        repository().preq(NetEngine.service.infoGet(info_id))
-                .doOnNext() {
-                    if (it.ok()) {
+        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()
+
 
-                        info.value = it.data() as DataInfoBean
+        }else {
+            repository().preq(NetEngine.service.infoGet(info_id))
+                    .doOnNext() {
+                        if (it.ok()) {
 
+                            info.value = it.data() as DataInfoBean
+
+                        }
                     }
-                }
-                .subscribe()
+                    .subscribe()
+        }
     }
 
 
@@ -130,6 +188,7 @@ open class SourceDetailsVModel : BViewModel<BRepository>() {
     fun setCancelOrder(info_id: String){
         //取消发布
 
+
         repository().lreq(NetEngine.service.infoCancel(info_id))
                 .doOnNext() {
                     if (it.ok()) {
@@ -182,17 +241,131 @@ open class SourceDetailsVModel : BViewModel<BRepository>() {
 
    fun isShowCancelBut(info_state:Int):Boolean{
         //取消按钮
+       if(type.value==2){
+           return false
+       }
          return type.value==1&&(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){//待评价--司机对货主的评价
+
+
+        }
+
+    }
+
+      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 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 choseImg() {
+        //选择照片
+        ChosePhotoUtils.getChosePhoto(view()!!.context(), 1)
 
+    }
 
 
 }

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

@@ -9,6 +9,7 @@ import com.quansu.heifengwuliu.inte.ChoiceData
 import com.quansu.heifengwuliu.model.CvDriving
 import com.quansu.heifengwuliu.model.CvVehicle
 import com.quansu.heifengwuliu.model.InfoBean
+import com.quansu.heifengwuliu.model.User
 import com.quansu.heifengwuliu.utils.ChosePhotoUtils
 import com.quansu.heifengwuliu.utils.PopupUtils
 import com.quansu.heifengwuliu.utils.net.NetEngine
@@ -16,6 +17,7 @@ import com.ysnows.base.base.BRepository
 import com.ysnows.base.base.BViewModel
 
 class VehicleInfoVModel : BViewModel<BRepository>() {
+    val info: MutableLiveData<InfoBean> = MutableLiveData<InfoBean>()
 
     var driverImg: MutableLiveData<String> = MutableLiveData("")
     var drivingZ: MutableLiveData<String> = MutableLiveData("")
@@ -30,6 +32,9 @@ class VehicleInfoVModel : BViewModel<BRepository>() {
 
     var color: MutableLiveData<String> = MutableLiveData("")//车辆颜色
     var carType: MutableLiveData<String> = MutableLiveData("")//车辆类型
+    var carCate: MutableLiveData<String> = MutableLiveData("")//车辆类型代码
+    var carEnergy: MutableLiveData<String> = MutableLiveData("")//车辆能源
+
 
     var regDate = MutableLiveData("")//注册日期
     var certDate=  MutableLiveData("")//发证日期
@@ -38,6 +43,8 @@ class VehicleInfoVModel : BViewModel<BRepository>() {
 
     var color_code=""
     var carType_code=""
+    var carCate_code=""
+    var carEnergy_code=""
 
 
 
@@ -56,8 +63,6 @@ class VehicleInfoVModel : BViewModel<BRepository>() {
         }
 
 
-
-
     @Bindable
     var carLoad: String? = null
         set(value) {
@@ -91,18 +96,8 @@ class VehicleInfoVModel : BViewModel<BRepository>() {
             field = value
             notifyPropertyChanged(BR.carSize)
         }
-    @Bindable
-    var carCate: String? = null
-        set(value) {
-            field = value
-            notifyPropertyChanged(BR.carCate)
-        }
-    @Bindable
-    var carEnergy: String? = null
-        set(value) {
-            field = value
-            notifyPropertyChanged(BR.carEnergy)
-        }
+
+
     @Bindable
     var carOwn: String? = null
         set(value) {
@@ -146,7 +141,6 @@ class VehicleInfoVModel : BViewModel<BRepository>() {
                     if (it.ok()) {
                        var bean=it.data() as CvVehicle
                         carOwn=bean.name
-                        carCate=bean.car_class
                         driverOrg=bean.official_seal
                         startDate.value=bean.issue_date
                         endDate.value=bean.valid_to
@@ -169,12 +163,7 @@ class VehicleInfoVModel : BViewModel<BRepository>() {
                             carSn=bean.vin
                             regDate.value=bean.register_date
                             certDate.value=bean.issue_date
-
-
-
-
-
-
+                            carBrand=bean.model
 
 
                         }else{//第二面
@@ -183,8 +172,6 @@ class VehicleInfoVModel : BViewModel<BRepository>() {
                             carSize=bean.overall_size
 
 
-
-
                         }
 
 
@@ -214,7 +201,7 @@ class VehicleInfoVModel : BViewModel<BRepository>() {
         }
 
         repository().lreq(NetEngine.service.setCar(driverImg.value, drivingZ.value, drivingF.value, tonnage.value.toString(),licenseDl,
-        licenseCy, color.value, carType.value,carLoad,carBrand,drivingSn,carWight,carSize,carCate,carEnergy,carOwn,
+        licenseCy, color_code, carType_code,carLoad,carBrand,drivingSn,carWight,carSize,carCate_code,carEnergy_code,carOwn,
         carUse,carSn,organization, regDate.value, certDate.value,driverOrg, startDate.value, endDate.value))
                 .doOnNext {
                     if (it.ok(true)) {
@@ -240,6 +227,8 @@ class VehicleInfoVModel : BViewModel<BRepository>() {
                         var bean = it.data() as InfoBean
                         if (null != bean) {
                             //todo:
+                            info.value=bean
+
                             driverImg.value=bean.driver_img
                             drivingZ.value=bean.driving_z
                             drivingF.value=bean.driving_f
@@ -248,14 +237,17 @@ class VehicleInfoVModel : BViewModel<BRepository>() {
                             licenseCy=bean.license_cy
                             color.value=bean.color.name
                             color_code=bean.color.code
-                            carType.value=bean.car_type
+                            carType.value=bean.car_type.name
+                            carType_code=bean.car_type.code
                             carLoad=bean.car_load
                             carBrand=bean.car_brand
                             drivingSn=bean.driving_sn
                             carWight=bean.car_weight
                             carSize=bean.car_size_h
-                            carCate=bean.car_cate.name
-                            carEnergy=bean.car_energy.name
+                            carCate.value=bean.car_cate.name
+                            carCate_code=bean.car_cate.code
+                            carEnergy.value=bean.car_energy.name
+                            carEnergy_code=bean.car_energy.code
                             carOwn= bean.car_own
                             carUse= bean.car_use
                             carSn=bean.car_sn

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

@@ -67,7 +67,7 @@
                                 android:textColor="@color/text_title"
                                 android:textSize="@dimen/sp_15"
                                 android:textStyle="bold"
-                                android:text="@{vm.info.info.send[0].province.name+vm.info.info.send[0].city.name}"
+                                android:text="@{vm.info.order.send[0].province.name+vm.info.order.send[0].city.name}"
                                tools:text="12344" />
 
 
@@ -102,7 +102,7 @@
                             android:textColor="@color/text_title"
                             android:textSize="@dimen/sp_15"
                             android:textStyle="bold"
-                            android:text="@{vm.info.info.receive[vm.info.info.receive.size()-1].province.name+vm.info.info.send[vm.info.info.receive.size()-1].city.name}"
+                            android:text="@{vm.info.order.receive[vm.info.order.receive.size()-1].province.name+vm.info.order.send[vm.info.order.receive.size()-1].city.name}"
                             tools:text="12344" />
 
                         </LinearLayout>
@@ -124,7 +124,7 @@
                             android:layout_weight="1"
                             android:gravity="center"
                             tools:text="经开区香港路9号"
-                            android:text="@{vm.info.info.send[0].address}"
+                            android:text="@{vm.info.order.send[0].address}"
                             android:textColor="@color/text_title"
                             android:textSize="13sp" />
 
@@ -138,7 +138,7 @@
                             android:layout_weight="1"
                             android:gravity="center"
                             tools:text="经开区香港路9号"
-                            android:text="@{vm.info.info.receive[vm.info.info.receive.size()-1].address}"
+                            android:text="@{vm.info.order.receive[vm.info.order.receive.size()-1].address}"
                             android:textColor="@color/text_title"
                             android:textSize="13sp" />
 
@@ -305,7 +305,7 @@
                             android:gravity="right"
                             android:textColor="@color/text_title"
                             android:textSize="@dimen/sp_13"
-                            android:text="@{vm.info.info.send[0].time}"
+                            android:text="@{vm.info.order.send[0].time}"
 
                             tools:text="2020-09-03 下午" />
 
@@ -333,7 +333,7 @@
                             android:gravity="right"
                             android:textColor="@color/text_title"
                             android:textSize="@dimen/sp_13"
-                            android:text="@{vm.info.info.receive[vm.info.info.receive.size()-1].time}"
+                            android:text="@{vm.info.order.receive[vm.info.order.receive.size()-1].time}"
                             tools:text="2020-09-03 下午" />
 
 
@@ -360,7 +360,7 @@
                             android:gravity="right"
                             android:textColor="@color/text_title"
                             android:textSize="@dimen/sp_13"
-                            android:text="@{vm.info.info.receive[vm.info.info.receive.size()-1].goods+@string/left_bracket+vm.info.info.receive[vm.info.info.receive.size()-1].goods_type.name+@string/right_bracket}"
+                            android:text="@{vm.info.order.receive[vm.info.order.receive.size()-1].goods+@string/left_bracket+vm.info.order.receive[vm.info.order.receive.size()-1].goods_type.name+@string/right_bracket}"
                             tools:text="苹果(农产品）" />
 
 
@@ -387,7 +387,7 @@
                             android:gravity="right"
                             android:textColor="@color/text_title"
                             android:textSize="@dimen/sp_13"
-                            android:text="@{vm.info.info.type_info.type_name+@string/spot+vm.info.info.type_info.longx}"
+                            android:text="@{vm.info.order.type_info.type_name+@string/spot+vm.info.order.type_info.longx}"
                             tools:text="平板货车 · 13米" />
 
                     </LinearLayout>
@@ -413,7 +413,7 @@
                             android:gravity="right"
                             android:textColor="@color/text_title"
                             android:textSize="@dimen/sp_13"
-                            android:text="@{vm.info.info.receive[vm.info.info.receive.size()-1].nums+vm.info.info.receive[vm.info.info.receive.size()-1].nums_type.name}"
+                            android:text="@{vm.info.order.receive[vm.info.order.receive.size()-1].nums+vm.info.order.receive[vm.info.order.receive.size()-1].nums_type.name}"
                             tools:text="35吨" />
 
                     </LinearLayout>
@@ -439,7 +439,7 @@
                             android:gravity="right"
                             android:textColor="@color/text_title"
                             android:textSize="@dimen/sp_13"
-                            android:text="@{@string/total_img+vm.info.info.receive[vm.info.info.receive.size()-1].price}"
+                            android:text="@{@string/total_img+vm.info.order.receive[vm.info.order.receive.size()-1].price}"
                             tools:text="¥3500" />
 
                     </LinearLayout>
@@ -466,7 +466,7 @@
                             android:gravity="right"
                             android:textColor="@color/text_title"
                             android:textSize="@dimen/sp_13"
-                            android:text="@{vm.info.info.data}"
+                            android:text="@{vm.info.order.data}"
                             tools:text="稳中求快" />
 
                     </LinearLayout>
@@ -528,7 +528,7 @@
 
                     <FrameLayout
                         android:layout_width="match_parent"
-                        android:onClick="@{v->vm.toGrab(vm.info.info.info_id)}"
+                        android:onClick="@{v->vm.toGrab(vm.info.order.info_id)}"
                         android:layout_height="wrap_content">
                     <ImageView
                         android:layout_width="match_parent"

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

@@ -20,11 +20,10 @@
         android:background="@color/color_page_bg"
         android:orientation="vertical">
 
-        <ScrollView
+        <FrameLayout
             android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:scrollbars="none">
+            android:layout_height="match_parent">
+
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -32,315 +31,734 @@
                 android:orientation="vertical">
 
 
-                <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+                <ScrollView
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/dp_10"
-                    android:layout_marginTop="@dimen/dp_10"
-                    android:layout_marginEnd="@dimen/dp_10"
-                    android:orientation="vertical"
-                    android:padding="@dimen/dp_10"
-                    app:qmui_backgroundColor="@color/white"
-                    app:qmui_radius="@dimen/dp_10">
+                    android:layout_height="0dp"
+                    android:layout_weight="1"
+                    android:scrollbars="none">
 
                     <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_height="wrap_content"
-                            android:layout_marginStart="@dimen/dp_10"
-                            android:layout_weight="1"
-                            android:gravity="center"
-                            android:text="@{vm.info.order.send[0].province.name+vm.info.order.send[0].city.name+vm.info.order.send[0].area.name}"
-                            android:textColor="#4D9EEB"
-                            android:textSize="@dimen/sp_15"
-                            tools:text="山东 临沂"></TextView>
+                        android:layout_height="match_parent"
+                        android:orientation="vertical">
 
-                        <ImageView
-                            android:layout_width="40dp"
-                            android:layout_height="20dp"
-                            android:src="@drawable/ic_arrow"></ImageView>
 
-                        <TextView
-                            android:id="@+id/tv_city_in"
-                            android:layout_width="0dp"
+                        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+                            android:layout_width="match_parent"
                             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+vm.info.order.receive[vm.info.order.receive.size()-1].area.name}"
-                            android:textColor="#BC5B55"
-                            android:textSize="@dimen/sp_15"
-                            tools:text="河北 唐山"></TextView>
-
+                            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">
 
-                    </LinearLayout>
 
-                    <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">
+                            <ImageView
+                                android:layout_width="40dp"
+                                android:layout_height="40dp"
+                                android:layout_marginTop="21dp"
+                                android:layout_marginBottom="21dp"
+                                android:src="@drawable/bg_need_error" />
 
-                    </androidx.recyclerview.widget.RecyclerView>
-                    </RelativeLayout>
+                            <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" />
 
-                    <RelativeLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
 
+                                <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="马勇" />
 
-                    <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">
-                    </androidx.recyclerview.widget.RecyclerView>
-                    </RelativeLayout>
 
-                </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+                            </LinearLayout>
 
 
-                <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/dp_10"
-                    android:layout_marginTop="@dimen/dp_10"
-                    android:layout_marginEnd="@dimen/dp_10"
-                    android:gravity="center_vertical"
-                    android:orientation="horizontal"
-                    android:padding="@dimen/dp_10"
-                    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_10">
+                        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
 
-                    <ImageView
-                        android:layout_width="60dp"
-                        android:layout_height="60dp"
-                        android:src="@drawable/ic_phone_enter">
+                        <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>
 
-                    <LinearLayout
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_marginStart="@dimen/dp_10"
-                        android:layout_marginEnd="@dimen/dp_10"
-                        android:layout_weight="1"
-                        android:orientation="vertical">
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="@dimen/dp_6"
-                            android:orientation="horizontal">
+                            <ImageView
+                                android:layout_width="40dp"
+                                android:layout_height="40dp"
+                                android:src="@drawable/bg_need_error">
 
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:textColor="@color/text_title"
-                                android:textSize="@dimen/sp_15"
-                                tools:text="乔治"></TextView>
+                            </ImageView>
 
-                            <TextView
+                            <LinearLayout
                                 android:layout_width="0dp"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="@dimen/dp_10"
+                                android:layout_height="match_parent"
+                                android:layout_marginStart="8dp"
+                                android:layout_marginEnd="@dimen/dp_10"
                                 android:layout_weight="1"
-                                android:textColor="@color/text_title"
-                                android:textSize="@dimen/sp_15"
-                                tools:text="18535965350"></TextView>
+                                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="20dp"
-                                android:layout_height="20dp"
-                                android:src="@drawable/ic_collect_off">
+                                android:layout_width="24dp"
+                                android:layout_height="24dp"
+                                android:src="@drawable/ic_details_phone">
 
                             </ImageView>
 
 
-                        </LinearLayout>
+                        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
 
-                        <LinearLayout
+                        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="@dimen/dp_4"
-                            android:orientation="horizontal">
+                            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"
+                                <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:textColor="@color/text_title"
-                                android:textSize="@dimen/sp_15"
-                                tools:text="鲁QAA888"></TextView>
+                                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"
+                                <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_marginStart="@dimen/dp_10"
-                                android:layout_marginEnd="@dimen/dp_10"
-                                android:text="/"
-                                android:textColor="@color/text_title"
-                                android:textSize="@dimen/sp_15"></TextView>
+                                android:layout_marginTop="@dimen/dp_14"
+                                android:gravity="center_vertical"
+                                android:orientation="horizontal">
 
-                            <TextView
-                                android:layout_width="0dp"
+                                <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.longx+@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_marginStart="@dimen/dp_10"
-                                android:layout_weight="1"
-                                android:textColor="@color/text_title"
-                                android:textSize="@dimen/sp_15"
-                                tools:text="平板车 13米"></TextView>
+                                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" />
 
-                        </LinearLayout>
 
+                                <TextView
 
-                    </LinearLayout>
+                                    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>
 
-                    <ImageView
-                        android:layout_width="20dp"
-                        android:layout_height="20dp"
-                        android:src="@drawable/ic_phone_out">
 
-                    </ImageView>
+                            </LinearLayout>
 
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="13dp"
+                                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" />
 
 
-                <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/dp_10"
-                    android:layout_marginTop="@dimen/dp_10"
-                    android:layout_marginEnd="@dimen/dp_10"
-                    android:orientation="vertical"
-                    android:padding="@dimen/dp_10"
-                    app:layout_goneMarginTop="@dimen/dp_10"
-                    app:qmui_backgroundColor="@color/white"
-                    app:qmui_radius="@dimen/dp_10">
+                                <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
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/dp_10"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal">
+                            </LinearLayout>
 
-                        <TextView
-                            android:layout_width="@dimen/dp_80"
-                            android:layout_height="wrap_content"
-                            android:text="运单号："
-                            android:textColor="@color/text_title1"
-                            android:textSize="@dimen/sp_15"></TextView>
 
-                        <TextView
+                        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:text="@{vm.info.order.info_sn}"
-                            android:textColor="@color/text_title"
-                            android:textSize="@dimen/sp_15"
-                            tools:text="电话:1835399999"></TextView>
 
+                        <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>
 
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/dp_10"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal"
-                        android:visibility="@{vm.info.order.type==1?View.VISIBLE :View.GONE}">
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:gravity="center_vertical"
+                                android:orientation="horizontal">
 
-                        <TextView
-                            android:layout_width="@dimen/dp_80"
-                            android:layout_height="wrap_content"
-                            android:text="货物信息："
-                            android:textColor="@color/text_title1"
-                            android:textSize="@dimen/sp_15"></TextView>
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="运费"
+                                    android:textColor="#767778"
+                                    android:textSize="@dimen/sp_14"></TextView>
 
-                        <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>
 
-                            android:layout_width="0dp"
+
+                            </LinearLayout>
+
+                        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+
+                        <!--     司机端按钮           -->
+                        <FrameLayout
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            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_15"
-                            tools:text="电话:1835399999"></TextView>
+                            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}">
+
+                            <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
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/dp_10"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal">
+                <!--        货主端按钮-->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="@dimen/dp_10"
+                    android:orientation="horizontal"
+                    android:visibility="@{vm.type==2?View.GONE:View.VISIBLE}">
 
-                        <TextView
-                            android:layout_width="@dimen/dp_80"
 
-                            android:layout_height="wrap_content"
-                            android:text="车型车长："
-                            android:textColor="@color/text_title1"
-                            android:textSize="@dimen/sp_15"></TextView>
+                    <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/text_title"
+                        android:visibility="@{vm.isShowCancelBut(vm.info.order.info_state)?View.VISIBLE:View.GONE}"
+                        app:qmui_borderColor="@color/color_line"
+                        app:qmui_radius="@dimen/dp_4">
+
+                    </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/text_title"
+                        android:visibility="@{vm.type==1?View.VISIBLE:View.GONE}"
+                        app:qmui_borderColor="@color/color_line"
+                        app:qmui_radius="@dimen/dp_4">
+
+                    </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/text_title"
+                        android:visibility="@{vm.isShowReceiveVehicle(vm.info.order.info_state)?View.VISIBLE:View.GONE}"
+                        app:qmui_borderColor="@color/color_line"
+                        app:qmui_radius="@dimen/dp_4">
+
+                    </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/text_title"
+                        android:visibility="@{vm.type==0?View.VISIBLE:View.GONE}"
+                        app:qmui_borderColor="@color/color_line"
+                        app:qmui_radius="@dimen/dp_4">
+
+                    </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:textColor="@color/text_title"
+                        android:visibility="@{vm.type==0?View.VISIBLE:View.GONE}"
+                        app:qmui_borderColor="@color/color_line"
+                        app:qmui_radius="@dimen/dp_4">
+
+                    </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton>
+
+
+                </LinearLayout>
 
-                        <TextView
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:text="@{vm.info.order.type_info.type_name+@string/spot+vm.info.order.type_info.longx+@string/rice}"
-                            android:textColor="@color/text_title"
-                            android:textSize="@dimen/sp_15"
-                            tools:text="电话:1835399999"></TextView>
+            </LinearLayout>
 
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="#80000000"
+                android:gravity="center"
+                android:visibility="@{vm.isDialogShow?View.VISIBLE:View.GONE}"
+                android:onClick="@{v->vm.interceptClick()}"
+                android:orientation="vertical">
 
-                    </LinearLayout>
+
+                <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_marginTop="@dimen/dp_10"
+                        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="@dimen/dp_80"
-
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="备注："
-                            android:textColor="@color/text_title1"
-                            android:textSize="@dimen/sp_15"></TextView>
+                            android:text="输入运送数量"
+                            android:textColor="#000000"
+                            android:textSize="17sp"
+                            android:textStyle="bold" />
 
-                        <TextView
+                        <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:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:text="@{vm.info.order.data}"
-                            android:textColor="@color/text_title"
-                            android:textSize="@dimen/sp_15"
-                            tools:text="电话:1835399999"></TextView>
+
+                            <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>
@@ -348,159 +766,91 @@
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/dp_10"
-                        android:layout_marginBottom="@dimen/dp_5"
-                        android:gravity="center_vertical"
+                        android:layout_marginStart="20dp"
+                        android:layout_marginBottom="4dp"
                         android:orientation="horizontal">
 
                         <TextView
-                            android:layout_width="@dimen/dp_80"
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="纸质回单："
-                            android:textColor="@color/text_title1"
-                            android:textSize="@dimen/sp_15"></TextView>
+                            android:text="凭证"
+                            android:textColor="#000000"
+                            android:textSize="17sp"
+                            android:textStyle="bold" />
 
-                        <TextView
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:textColor="@color/text_title"
-                            android:textSize="@dimen/sp_15"
-                            tools:text="电话:1835399999"></TextView>
 
+                        <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">
 
-                </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="@dimen/dp_10"
-                    android:layout_marginTop="@dimen/dp_10"
-                    android:layout_marginEnd="@dimen/dp_10"
-                    android:orientation="vertical"
-                    android:padding="@dimen/dp_10"
-                    app:layout_goneMarginTop="@dimen/dp_10"
-                    app:qmui_backgroundColor="@color/white"
-                    app:qmui_radius="@dimen/dp_10">
+                    </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:layout_marginTop="@dimen/dp_10"
-                        android:gravity="center_vertical"
                         android:orientation="horizontal">
 
                         <TextView
-                            android:layout_width="@dimen/dp_80"
+                            android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:text="总运费："
-                            android:textColor="@color/text_title1"
-                            android:textSize="@dimen/sp_15"></TextView>
+                            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" />
 
                         <TextView
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
+                            android:layout_marginTop="15dp"
+                            android:layout_marginBottom="17dp"
                             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_15"
-                            tools:text="￥30000"></TextView>
+                            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" />
 
 
                     </LinearLayout>
 
+
                 </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
+
             </LinearLayout>
-        </ScrollView>
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            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/text_title"
-                android:visibility="@{vm.isShowCancelBut(vm.info.order.info_state)?View.VISIBLE:View.GONE}"
-                app:qmui_borderColor="@color/color_line"
-                app:qmui_radius="@dimen/dp_4">
-
-            </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/text_title"
-                android:visibility="@{vm.type==1?View.VISIBLE:View.GONE}"
-                app:qmui_borderColor="@color/color_line"
-                app:qmui_radius="@dimen/dp_4">
-
-            </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/text_title"
-                android:visibility="@{vm.isShowReceiveVehicle(vm.info.order.info_state)?View.VISIBLE:View.GONE}"
-                app:qmui_borderColor="@color/color_line"
-                app:qmui_radius="@dimen/dp_4">
-
-            </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/text_title"
-                android:visibility="@{vm.type==0?View.VISIBLE:View.GONE}"
-                app:qmui_borderColor="@color/color_line"
-                app:qmui_radius="@dimen/dp_4">
-
-            </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:textColor="@color/text_title"
-                android:visibility="@{vm.type==0?View.VISIBLE:View.GONE}"
-                app:qmui_borderColor="@color/color_line"
-                app:qmui_radius="@dimen/dp_4">
-
-            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton>
-
-
-        </LinearLayout>
+
+        </FrameLayout>
 
 
     </LinearLayout>

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

@@ -309,7 +309,6 @@
 
 
                         <com.ysnows.base.widget.DelEditText
-
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:background="@color/white"
@@ -606,8 +605,10 @@
                     </LinearLayout>
 
                     <LinearLayout
+                        android:id="@+id/ll_car_cate"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:gravity="center_vertical"
                         android:layout_marginTop="13dp"
                         android:orientation="horizontal">
 
@@ -620,25 +621,31 @@
                             android:textSize="14sp" />
 
 
-                        <com.ysnows.base.widget.DelEditText
+
+                        <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:background="@color/white"
-                            android:gravity="right|center"
-                            android:hint="车辆类型代码"
+                            android:hint="请选择"
                             android:text="@{vm.carCate}"
-                            android:paddingStart="@dimen/dp_10"
-                            android:textColor="#26292F"
+                            android:textColor="@color/text_title"
                             android:textColorHint="#979899"
-                            android:textSize="@dimen/sp_13" />
+                            android:textSize="13sp" />
+
+                        <ImageView
+                            android:layout_width="8dp"
+                            android:layout_height="13dp"
+                            android:layout_marginStart="5dp"
+                            android:src="@drawable/ic_car_right" />
 
 
                     </LinearLayout>
 
                     <LinearLayout
+                        android:id="@+id/ll_car_energy"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="13dp"
+                        android:gravity="center_vertical"
                         android:orientation="horizontal">
 
                         <TextView
@@ -650,19 +657,20 @@
                             android:textSize="14sp" />
 
 
-                        <com.ysnows.base.widget.DelEditText
+                        <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:background="@color/white"
-                            android:gravity="right|center"
-                            android:hint="车辆能源类型"
+                            android:hint="请选择"
                             android:text="@{vm.carEnergy}"
-
-                            android:paddingStart="@dimen/dp_10"
-                            android:textColor="#26292F"
+                            android:textColor="@color/text_title"
                             android:textColorHint="#979899"
-                            android:textSize="@dimen/sp_13" />
+                            android:textSize="13sp" />
 
+                        <ImageView
+                            android:layout_width="8dp"
+                            android:layout_height="13dp"
+                            android:layout_marginStart="5dp"
+                            android:src="@drawable/ic_car_right" />
 
                     </LinearLayout>
 

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

@@ -57,7 +57,7 @@
                 android:id="@+id/tv_status"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@{vm.getOrderStatus(item.info_state)}"
+                android:text="@{vm.getOrderStatus(item.order_state)}"
                 tools:text="待取货"
                 android:textSize="14sp"
                 android:textColor="#FFBC00"
@@ -114,7 +114,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="@dimen/dp_10"
-                android:text="@{item.send[0].province.name+item.send[0].city.name+item.send[0].area.name}"
+                android:text="@{item.send[0].province.name+item.send[0].city.name}"
                 android:textColor="@color/text_title"
                 android:textStyle="bold"
                 android:textSize="@dimen/sp_15"
@@ -129,7 +129,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/dp_10"
-                android:text="@{item.receive[item.receive.size()-1].province.name+item.receive[item.receive.size()-1].city.name+item.receive[item.receive.size()-1].area.name}"
+                android:text="@{item.receive[item.receive.size()-1].province.name+item.receive[item.receive.size()-1].city.name}"
                 android:textColor="@color/text_title"
                 android:textStyle="bold"
                 android:textSize="@dimen/sp_15"

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

@@ -1,180 +1,172 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:android="http://schemas.android.com/apk/res/android" >
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
 
-    <data >
         <import type="android.view.View" />
 
+
         <variable
-            name="type"
+            name="position"
             type="Integer" />
+
         <variable
             name="item"
             type="com.quansu.heifengwuliu.model.DataInfoBean.OrderBean.ReceiveBean" />
-    </data >
+    </data>
 
-    <LinearLayout
+    <LinearLayout xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        xmlns:tools="http://schemas.android.com/tools"
         android:orientation="vertical">
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:orientation="horizontal"
-            android:layout_marginTop="@dimen/dp_10"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="9dp"
             android:gravity="center_vertical"
-            android:layout_height="wrap_content">
+            android:orientation="horizontal">
 
             <ImageView
-                android:layout_width="25dp"
-                android:layout_height="25dp"
-                android:src="@drawable/ic_time"
-                android:layout_marginEnd="@dimen/dp_10"
-                />
+                android:layout_width="19dp"
+                android:layout_height="19dp"
+                android:layout_marginEnd="8dp"
+                android:src="@drawable/ic_time" />
 
 
             <TextView
                 android:layout_width="match_parent"
-                android:textSize="@dimen/sp_15"
-                android:textColor="@color/text_title"
+                android:layout_height="wrap_content"
                 android:text="@{item.time}"
-                tools:text="08-01-1"
-                android:layout_height="wrap_content">
-            </TextView>
+                android:textColor="@color/text_title"
+                android:textSize="@dimen/sp_14"
+                tools:text="08-01-1"></TextView>
 
         </LinearLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:orientation="horizontal"
-            android:layout_marginTop="@dimen/dp_10"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="14dp"
             android:gravity="center_vertical"
-            android:layout_height="wrap_content">
+            android:orientation="horizontal">
 
-            <ImageView
-                android:layout_width="25dp"
-                android:layout_height="25dp"
-                android:src="@drawable/ic_enter"
-                android:layout_marginEnd="@dimen/dp_10"
-                />
+            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+                android:layout_width="26dp"
+                android:layout_height="26dp"
+                android:layout_marginEnd="6dp"
+                android:gravity="center"
+                app:qmui_backgroundColor="#ED702D"
+                app:qmui_borderColor="#ED702D"
+                app:qmui_radius="25dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@{@string/discharge+(position+1)}"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/sp_14" />
+
+            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
 
             <TextView
                 android:layout_width="match_parent"
-                android:textSize="@dimen/sp_15"
-                android:textColor="@color/text_title"
+                android:layout_height="wrap_content"
                 android:text="@{item.province.name+item.city.name+item.area.name}"
-                android:layout_height="wrap_content">
-            </TextView>
+                android:textColor="@color/text_title"
+                android:textSize="@dimen/sp_15"
+                android:textStyle="bold"
+                tools:text="山东省 临沂市 河东区 香港路999号"></TextView>
+
 
         </LinearLayout>
 
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:orientation="horizontal"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="14dp"
             android:gravity="center_vertical"
-            android:paddingStart="35dp"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginBottom="@dimen/dp_5"
-            android:layout_height="wrap_content">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:textSize="@dimen/sp_15"
-                android:textColor="@color/text_title"
-                android:text="联系人:"
-                android:layout_height="wrap_content">
-            </TextView>
-            <TextView
-                android:layout_width="wrap_content"
-                android:textSize="@dimen/sp_15"
-                android:textColor="@color/text_title"
-                android:text="@{item.name}"
-                android:layout_height="wrap_content">
-            </TextView>
+            android:orientation="horizontal"
+            android:paddingStart="31dp">
 
-            <TextView
+            <LinearLayout
                 android:layout_width="0dp"
-                android:layout_weight="1"
-                android:gravity="right"
-                android:textSize="@dimen/sp_15"
-                android:textColor="@color/text_title"
-                android:text="电话:"
-                android:layout_height="wrap_content">
-            </TextView>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:textSize="@dimen/sp_15"
-                android:textColor="@color/text_title"
-                 android:text="@{item.mobile}"
-                android:layout_height="wrap_content">
-            </TextView>
+                android:layout_height="wrap_content"
+                android:layout_weight="1">
 
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="联系人:"
+                    android:textColor="#636465"
+                    android:textSize="@dimen/sp_13" />
 
-        </LinearLayout>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@{item.name}"
+                    android:textColor="#636465"
+                    android:textSize="@dimen/sp_13" />
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:orientation="vertical"
-            android:visibility="@{type==2?View.VISIBLE:View.GONE}"
-            android:layout_marginTop="@dimen/dp_5"
-            android:layout_marginBottom="@dimen/dp_5"
-            android:layout_height="wrap_content">
+            </LinearLayout>
 
             <LinearLayout
-                android:layout_width="match_parent"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:paddingStart="35dp"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
+                android:layout_weight="1">
 
                 <TextView
-                    android:layout_width="@dimen/dp_80"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textColor="@color/text_title"
-                    android:textSize="@dimen/sp_15"
-                    android:text="货物信息："></TextView>
+                    android:text="电话:"
+                    android:textColor="#636465"
+                    android:textSize="@dimen/sp_13" />
 
-                <TextView
 
-                    android:layout_width="0dp"
+                <TextView
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@{item.goods+@string/spot+item.nums+item.nums_type.name}"
-                    android:textColor="@color/text_title"
-                    android:textSize="@dimen/sp_15"
-                    tools:text="水泥 35吨"></TextView>
-
+                    android:text="@{item.mobile}"
+                    android:textColor="#636465"
+                    android:textSize="@dimen/sp_13" />
 
             </LinearLayout>
 
 
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+           >
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingStart="35dp"
-                android:layout_marginTop="@dimen/dp_5"
                 android:gravity="center_vertical"
-                android:orientation="horizontal">
+                android:orientation="horizontal"
+                android:paddingStart="31dp">
 
                 <TextView
                     android:layout_width="@dimen/dp_80"
                     android:layout_height="wrap_content"
+                    android:text="货物信息："
                     android:textColor="@color/text_title"
-                    android:textSize="@dimen/sp_15"
-                    android:text="总价："></TextView>
+                    android:textSize="@dimen/sp_14"></TextView>
 
                 <TextView
 
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:text="@{@string/total_img+item.total}"
+                    android:text="@{item.goods+@string/spot+item.nums+item.nums_type.name}"
                     android:textColor="@color/text_title"
-                    android:textSize="@dimen/sp_15"
+                    android:textSize="@dimen/sp_14"
                     tools:text="水泥 35吨"></TextView>
 
 
@@ -185,11 +177,10 @@
         </LinearLayout>
 
 
-
     </LinearLayout>
 
 
-</layout >
+</layout>
 
 
 

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

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <data >
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <data>
 
 
         <variable
@@ -11,117 +10,127 @@
             type="com.quansu.heifengwuliu.model.DataInfoBean.OrderBean.SendBean" />
 
 
+    </data>
 
-    </data >
-
-    <LinearLayout
+    <LinearLayout xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        xmlns:tools="http://schemas.android.com/tools"
         android:orientation="vertical">
 
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:orientation="horizontal"
-            android:layout_marginTop="@dimen/dp_10"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
             android:gravity="center_vertical"
-            android:layout_height="wrap_content">
+            android:orientation="horizontal">
 
             <ImageView
-                android:layout_width="25dp"
-                android:layout_height="25dp"
-                android:src="@drawable/ic_time"
-                android:layout_marginEnd="@dimen/dp_10"
-                />
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:layout_marginEnd="7dp"
+                android:src="@drawable/ic_time" />
 
 
             <TextView
                 android:layout_width="match_parent"
-                android:textSize="@dimen/sp_15"
-                android:textColor="@color/text_title"
+                android:layout_height="wrap_content"
                 android:text="@{item.time}"
-                tools:text="08-01-1"
-                android:layout_height="wrap_content">
-            </TextView>
+                android:textColor="@color/text_title"
+                android:textSize="@dimen/sp_14"
+                tools:text="08-01-1"></TextView>
 
         </LinearLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:orientation="horizontal"
-            android:layout_marginTop="@dimen/dp_10"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="13dp"
             android:gravity="center_vertical"
-            android:layout_height="wrap_content">
+            android:orientation="horizontal">
 
             <ImageView
-                android:layout_width="25dp"
-                android:layout_height="25dp"
-                android:src="@drawable/ic_out"
-                android:layout_marginEnd="@dimen/dp_10"
-                />
+                android:layout_width="26dp"
+                android:layout_height="26dp"
+                android:layout_marginEnd="6dp"
+                android:src="@drawable/ic_out" />
 
 
             <TextView
-                android:layout_width="match_parent"
-                android:textSize="@dimen/sp_15"
-                android:textColor="@color/text_title"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
                 android:text="@{item.province.name+item.city.name+item.area.name}"
-                tools:text="山东省临沂市 河东区 香港路999号"
-                android:layout_height="wrap_content">
-            </TextView>
+                android:textColor="@color/text_title"
+                android:textSize="@dimen/sp_15"
+                android:textStyle="bold"
+                tools:text="山东省临沂市 河东区 香港路999号" />
+
+            <ImageView
+                android:layout_width="17dp"
+                android:layout_height="22dp"
+                android:layout_marginStart="32dp"
+                android:src="@drawable/ic_item_address" />
+
 
         </LinearLayout>
 
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:orientation="horizontal"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
             android:gravity="center_vertical"
-            android:paddingStart="35dp"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_height="wrap_content">
-            <TextView
-                android:layout_width="wrap_content"
-                android:textSize="@dimen/sp_15"
-                android:textColor="@color/text_title"
-                android:text="联系人:"
-                android:layout_height="wrap_content">
-            </TextView>
-            <TextView
-                android:layout_width="wrap_content"
-                android:textSize="@dimen/sp_15"
-                android:textColor="@color/text_title"
-                android:text="@{item.name}"
-                android:layout_height="wrap_content">
-            </TextView>
+            android:orientation="horizontal"
+            android:paddingStart="31dp">
 
-            <TextView
+            <LinearLayout
                 android:layout_width="0dp"
-                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:layout_weight="1">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="联系人:"
+                    android:textColor="#636465"
+                    android:textSize="@dimen/sp_13"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@{item.name}"
+                    android:textColor="#636465"
+                    android:textSize="@dimen/sp_13"/>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:gravity="right"
-                android:textSize="@dimen/sp_15"
-                android:textColor="@color/text_title"
                 android:text="电话:"
-                android:layout_height="wrap_content">
-            </TextView>
+                android:textColor="#636465"
+                android:textSize="@dimen/sp_13"/>
 
             <TextView
                 android:layout_width="wrap_content"
-                android:textSize="@dimen/sp_15"
-                android:textColor="@color/text_title"
+                android:layout_height="wrap_content"
                 android:text="@{item.mobile}"
-                android:layout_height="wrap_content">
-            </TextView>
+                android:textColor="#636465"
+                android:textSize="@dimen/sp_13"/>
+            </LinearLayout>
 
         </LinearLayout>
 
-
-
     </LinearLayout>
 
 
-</layout >
+</layout>
 
 
 

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

@@ -410,7 +410,7 @@ Api 已达到使用限制
     <string name="developing" >此功能正在开放中...</string >
     <string name="go_go_go" >立即进入</string >
     <!--    -->
-    <string name="home" >货源</string >
+    <string name="home" >货源大厅</string >
     <string name="waybill" >我的运单</string >
     <string name="my" >个人中心</string >
     <string name="your_status" >您的身份</string >
@@ -476,6 +476,9 @@ Api 已达到使用限制
     <string name="to_picked_up" >待取货</string >
     <string name="in_transit" >运输中</string >
     <string name="to_settled">待结算</string>
+    <string name="to_evaluate">待评价</string>
+
+
     <string name="share">分享</string>
     <string name="source_details">货源详情</string>
     <string name="single">单</string>
@@ -483,7 +486,8 @@ Api 已达到使用限制
     <string name="percent_sign">%</string>
     <string name="left_bracket">(</string>
     <string name="right_bracket">)</string>
-
+    <string name="deliver_goods">发货</string>
+    <string name="discharge">卸</string>
 
 
 </resources >