From cfc9b816509e9ddfca856851533b7e6f1598b0e9 Mon Sep 17 00:00:00 2001
From: lijia <john_095130@163.com>
Date: Wed, 6 Mar 2024 16:16:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8D=95=E5=8A=9F=E8=83=BD=E5=B0=81?=
 =?UTF-8?q?=E8=A3=85=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dahe/gldriver/adapter/SelectCarAdapter.kt |  39 +++++++
 .../java/com/dahe/gldriver/bean/CarBean.kt    |  33 ++++++
 .../com/dahe/gldriver/mypop/PopBottomCar.kt   |  93 ++++++++++++++++
 .../main/java/com/dahe/gldriver/net/Api.kt    |   8 ++
 .../gldriver/ui/account/SelectRoleActivity.kt |   4 -
 .../account/authperson/AuthPersonActivity.kt  |   3 -
 .../ui/account/authteam/AuthTeamActivity.kt   |   8 --
 .../com/dahe/gldriver/ui/home/HomeFragment.kt |  20 ++--
 .../waybill/activity/WaybillDetailActivity.kt |  69 +++---------
 .../waybill/activity/WaybillLoadActivity.kt   |   1 -
 .../com/dahe/gldriver/utils/CommonPopUtils.kt |  34 +++++-
 .../com/dahe/gldriver/utils/OrderUtils.kt     |  72 +++++++++++++
 app/src/main/res/drawable/select_car_bg.xml   |   7 ++
 app/src/main/res/drawable/shape_select_5.xml  |  16 +++
 app/src/main/res/layout/choice_car.xml        |  40 +++++++
 app/src/main/res/layout/item_car.xml          |  57 ++++++++++
 .../java/com/dahe/mylibrary/bean/CarBean.java | 100 ------------------
 mylibrary/src/main/res/drawable/bg_bai.xml    |   3 +-
 18 files changed, 420 insertions(+), 187 deletions(-)
 create mode 100644 app/src/main/java/com/dahe/gldriver/adapter/SelectCarAdapter.kt
 create mode 100644 app/src/main/java/com/dahe/gldriver/bean/CarBean.kt
 create mode 100644 app/src/main/java/com/dahe/gldriver/mypop/PopBottomCar.kt
 create mode 100644 app/src/main/res/drawable/select_car_bg.xml
 create mode 100644 app/src/main/res/drawable/shape_select_5.xml
 create mode 100644 app/src/main/res/layout/choice_car.xml
 create mode 100644 app/src/main/res/layout/item_car.xml
 delete mode 100644 mylibrary/src/main/java/com/dahe/mylibrary/bean/CarBean.java

diff --git a/app/src/main/java/com/dahe/gldriver/adapter/SelectCarAdapter.kt b/app/src/main/java/com/dahe/gldriver/adapter/SelectCarAdapter.kt
new file mode 100644
index 0000000..63e585d
--- /dev/null
+++ b/app/src/main/java/com/dahe/gldriver/adapter/SelectCarAdapter.kt
@@ -0,0 +1,39 @@
+package com.dahe.gldriver.adapter
+
+import android.content.Context
+import android.view.ViewGroup
+import android.widget.Button
+import android.widget.LinearLayout
+import com.chad.library.adapter4.BaseQuickAdapter
+import com.chad.library.adapter4.viewholder.QuickViewHolder
+import com.dahe.gldriver.R
+import com.dahe.gldriver.bean.CarBean
+import com.dahe.glex.bean.WayBillBean
+
+/**
+ * @ClassName WaybillAdapter
+ * @Author 用户
+ * @Date 2024/1/23 16:27
+ * @Description TODO
+ */
+class SelectCarAdapter :
+    BaseQuickAdapter<CarBean, QuickViewHolder>() {
+    override fun onBindViewHolder(holder: QuickViewHolder, position: Int, item: CarBean?) {
+        holder.run {
+            setText(R.id.tvCarNum, item?.vehicleNum)
+            setText(R.id.tvCarType, """${item?.vehicleType}""")
+            setText(R.id.tvCarLen, """车长:${item?.carLong}""")
+            setText(R.id.tvCarWei, """核定载重:${item?.approvedLoad}""")
+            setSelected(R.id.llContent, item?.isSelect!!)
+        }
+    }
+
+    override fun onCreateViewHolder(
+        context: Context,
+        parent: ViewGroup,
+        viewType: Int
+    ): QuickViewHolder {
+        // 返回一个 ViewHolder
+        return QuickViewHolder(R.layout.item_car, parent)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/dahe/gldriver/bean/CarBean.kt b/app/src/main/java/com/dahe/gldriver/bean/CarBean.kt
new file mode 100644
index 0000000..4f6f711
--- /dev/null
+++ b/app/src/main/java/com/dahe/gldriver/bean/CarBean.kt
@@ -0,0 +1,33 @@
+package com.dahe.gldriver.bean
+
+/**
+ * @ClassName CarBean
+ * @Author john
+ * @Date 2024/3/6 10:26
+ * @Description TODO
+ */
+data class CarBean(
+    val approvedLoad: String="",
+    val carHeight: String="",
+    val carId: String="",
+    val carLong: String="",
+    val carUrl: String="",
+    val carWidth: String="",
+    val energySign: String="",
+    val energySignCode: String="",
+    val isTrailer: String="",
+    val plateColor: String="",
+    val plateColorCode: String="",
+    val trailerApprovedLoad: String="",
+    val trailerHeight: String="",
+    val trailerId: String="",
+    val trailerLong: String="",
+    val trailerUrl: String="",
+    val trailerVehicleNum: String="",
+    val trailerVehicleType: String="",
+    val trailerVehicleTypeCode: String="",
+    var vehicleNum: String="",
+    val vehicleType: String="",
+    val vehicleTypeCode: String="",
+    var isSelect: Boolean = false
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/dahe/gldriver/mypop/PopBottomCar.kt b/app/src/main/java/com/dahe/gldriver/mypop/PopBottomCar.kt
new file mode 100644
index 0000000..2ea9bc9
--- /dev/null
+++ b/app/src/main/java/com/dahe/gldriver/mypop/PopBottomCar.kt
@@ -0,0 +1,93 @@
+package com.dahe.gldriver.mypop
+
+import android.content.Context
+import android.graphics.Color
+import android.widget.Button
+import android.widget.LinearLayout
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.chad.library.adapter4.BaseQuickAdapter
+import com.dahe.gldriver.R
+import com.dahe.gldriver.adapter.SelectCarAdapter
+import com.dahe.gldriver.bean.CarBean
+import com.dahe.mylibrary.adapter.GridImageAdapter
+import com.dahe.mylibrary.callback.OnPicResultListener
+import com.dahe.mylibrary.recycleviewswipe.RecycleViewDivider
+import com.dahe.mylibrary.utils.ConvertUtils
+import com.luck.picture.lib.entity.LocalMedia
+import com.lxj.xpopup.core.BottomPopupView
+
+
+/**
+ * @ClassName PopBottomPic
+ * @Author john
+ * @Date 2024/1/31 11:11
+ * @Description TODO
+ */
+class PopBottomCar(
+    context: Context,
+    cars: MutableList<CarBean>,
+    onCarSelectListener: OnCarSelectListener
+) : BottomPopupView(context) {
+
+    private var cars: MutableList<CarBean>
+    private var listener: OnCarSelectListener
+    private var currCar: CarBean? = null
+
+    init {
+        this.listener = onCarSelectListener
+        this.cars = cars
+    }
+
+
+    override fun getImplLayoutId() = R.layout.choice_car
+
+    override fun onCreate() {
+        super.onCreate()
+        var recycler = findViewById<RecyclerView>(R.id.recycler)
+        var btnOk = findViewById<Button>(R.id.btnOk)
+        initRecycle(recycler)
+
+        btnOk.setOnClickListener {
+            if (currCar == null) {
+                dismiss()
+                return@setOnClickListener
+            }
+
+            if (listener != null) {
+                listener.onResult(currCar!!)
+                dismiss()
+            }
+        }
+
+    }
+
+    private fun initRecycle(recycler: RecyclerView) {
+        recycler.run {
+            layoutManager = LinearLayoutManager(context, RecyclerView.VERTICAL, false)
+            setHasFixedSize(true)
+            addItemDecoration(
+                RecycleViewDivider(
+                    LinearLayout.VERTICAL,
+                    ConvertUtils.dp2px(10.0f),
+                    Color.TRANSPARENT
+                )
+            )
+            adapter = SelectCarAdapter()
+            (adapter as SelectCarAdapter).submitList(cars)
+            (adapter as SelectCarAdapter)
+        }.run {
+            setOnItemClickListener() { adapter, view, position ->
+                currCar = items[position]
+                items.find { it.isSelect }?.isSelect = false
+                items[position].isSelect = true
+                notifyDataSetChanged()
+            }
+        }
+    }
+
+}
+
+fun interface OnCarSelectListener {
+    fun onResult(result: CarBean)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/dahe/gldriver/net/Api.kt b/app/src/main/java/com/dahe/gldriver/net/Api.kt
index 72f7351..22bb975 100644
--- a/app/src/main/java/com/dahe/gldriver/net/Api.kt
+++ b/app/src/main/java/com/dahe/gldriver/net/Api.kt
@@ -2,6 +2,7 @@ package com.dahe.gldriver.net
 
 import com.dahe.gldriver.BuildConfig
 import com.dahe.gldriver.bean.AuthTeamBean
+import com.dahe.gldriver.bean.CarBean
 import com.dahe.gldriver.bean.OcrPersonBean
 import com.dahe.gldriver.bean.OrderDetailBean
 import com.dahe.gldriver.bean.OssBean
@@ -155,6 +156,13 @@ interface Api {
     @GET(BASE_URL + "driver/order/detail")
     fun orderDetail(@Query("orderId") orderId: String): Observable<CommonResponseBean<OrderDetailBean>>
 
+    /**
+     *
+     * 车辆列表
+     * */
+    @GET(BASE_URL+"driver/car/carList")
+    fun carList(): Observable<CommonResponseBean<MutableList<CarBean>>>
+
     /**
      * 司机接单
      * */
diff --git a/app/src/main/java/com/dahe/gldriver/ui/account/SelectRoleActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/account/SelectRoleActivity.kt
index f7f852d..71d7470 100644
--- a/app/src/main/java/com/dahe/gldriver/ui/account/SelectRoleActivity.kt
+++ b/app/src/main/java/com/dahe/gldriver/ui/account/SelectRoleActivity.kt
@@ -6,11 +6,7 @@ import com.dahe.gldriver.databinding.ActivitySelectRoleBinding
 import com.dahe.gldriver.net.BaseObserver
 import com.dahe.gldriver.net.DataManager
 import com.dahe.gldriver.net.RxHttpCallBack
-import com.dahe.gldriver.ui.account.authperson.AuthBankCardActivity
-import com.dahe.gldriver.ui.account.authperson.AuthDriverActivity
 import com.dahe.gldriver.ui.account.authperson.AuthDrivingActivity
-import com.dahe.gldriver.ui.account.authperson.AuthPersonActivity
-import com.dahe.gldriver.ui.account.authperson.AuthQualificationActivity
 import com.dahe.gldriver.ui.account.authteam.AuthTeamActivity
 import com.dahe.mylibrary.base.BaseActivity
 import com.dahe.mylibrary.net.CommonResponseBean
diff --git a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthPersonActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthPersonActivity.kt
index 41a46fb..4605ba0 100644
--- a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthPersonActivity.kt
+++ b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthPersonActivity.kt
@@ -3,7 +3,6 @@ package com.dahe.gldriver.ui.account.authperson
 import android.os.Bundle
 import com.dahe.gldriver.R
 import com.dahe.gldriver.bean.OcrPersonBean
-import com.dahe.gldriver.bean.OssBean
 import com.dahe.gldriver.bean.UpPersonInfoBean
 import com.dahe.gldriver.databinding.ActivityAuthPersonBinding
 import com.dahe.gldriver.net.BaseObserver
@@ -11,7 +10,6 @@ import com.dahe.gldriver.net.DataManager
 import com.dahe.gldriver.net.RxHttpCallBack
 import com.dahe.gldriver.oss.OssServiceUtil
 import com.dahe.gldriver.utils.OcrUtils
-import com.dahe.glex.bean.UserBean
 import com.dahe.mylibrary.base.BaseActivity
 import com.dahe.mylibrary.net.CommonResponseBean
 import com.dahe.mylibrary.utils.ActivityUtils
@@ -20,7 +18,6 @@ import com.dahe.mylibrary.utils.PickerUtils
 import com.dahe.mylibrary.utils.PopsUtils
 import com.dahe.mylibrary.utils.TimeUtil
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
-import io.reactivex.rxjava3.functions.Function
 import io.reactivex.rxjava3.schedulers.Schedulers
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.MultipartBody
diff --git a/app/src/main/java/com/dahe/gldriver/ui/account/authteam/AuthTeamActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/account/authteam/AuthTeamActivity.kt
index 0e1ca4f..d062597 100644
--- a/app/src/main/java/com/dahe/gldriver/ui/account/authteam/AuthTeamActivity.kt
+++ b/app/src/main/java/com/dahe/gldriver/ui/account/authteam/AuthTeamActivity.kt
@@ -5,8 +5,6 @@ import android.view.View
 import com.dahe.gldriver.R
 import com.dahe.gldriver.bean.AuthTeamBean
 import com.dahe.gldriver.bean.OcrPersonBean
-import com.dahe.gldriver.bean.UpPersonInfoBean
-import com.dahe.gldriver.callback.PicPath
 import com.dahe.gldriver.databinding.ActivityAuthTeamBinding
 import com.dahe.gldriver.net.BaseObserver
 import com.dahe.gldriver.net.DataManager
@@ -16,17 +14,11 @@ import com.dahe.gldriver.utils.OcrUtils
 import com.dahe.mylibrary.base.BaseActivity
 import com.dahe.mylibrary.net.CommonResponseBean
 import com.dahe.mylibrary.utils.ImageLoader
-import com.dahe.mylibrary.utils.LoadingUtils
-import com.dahe.mylibrary.utils.LoadingUtils3
 import com.dahe.mylibrary.utils.PickerUtils
 import com.dahe.mylibrary.utils.PopsUtils
 import com.dahe.mylibrary.utils.TimeUtil
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.schedulers.Schedulers
-import okhttp3.MediaType.Companion.toMediaTypeOrNull
-import okhttp3.MultipartBody
-import okhttp3.RequestBody.Companion.asRequestBody
-import java.io.File
 
 /**
  * @ClassName AuthTeamActivity
diff --git a/app/src/main/java/com/dahe/gldriver/ui/home/HomeFragment.kt b/app/src/main/java/com/dahe/gldriver/ui/home/HomeFragment.kt
index 4c2e756..7f6af9a 100644
--- a/app/src/main/java/com/dahe/gldriver/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/dahe/gldriver/ui/home/HomeFragment.kt
@@ -5,11 +5,11 @@ import android.os.Bundle
 import android.widget.LinearLayout
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.amap.api.services.route.DistanceSearch
 import com.dahe.gldriver.R
 import com.dahe.gldriver.adapter.GridItemAdapter
 import com.dahe.gldriver.adapter.WaybillAdapter
 import com.dahe.gldriver.base.AppConfig
+import com.dahe.gldriver.bean.CarBean
 import com.dahe.gldriver.bean.GridBean
 import com.dahe.gldriver.databinding.FragmentHomeBinding
 import com.dahe.gldriver.event.OrderStauEvent
@@ -17,8 +17,8 @@ import com.dahe.gldriver.net.BaseObserver
 import com.dahe.gldriver.net.DataManager
 import com.dahe.gldriver.net.RxHttpCallBack
 import com.dahe.gldriver.ui.waybill.activity.WaybillDetailActivity
-import com.dahe.gldriver.ui.waybill.activity.WaybillLoadActivity
-import com.dahe.gldriver.ui.waybill.activity.WaybillUnlLoadActivity
+import com.dahe.gldriver.utils.CommonPopUtils
+import com.dahe.gldriver.utils.OrderUtils
 import com.dahe.glex.bean.OrderBean
 import com.dahe.mylibrary.base.BaseFragment
 import com.dahe.mylibrary.callback.RefreshCallBack
@@ -26,7 +26,6 @@ import com.dahe.mylibrary.net.CommonResponseBean
 import com.dahe.mylibrary.recycleviewswipe.RecycleViewDivider
 import com.dahe.mylibrary.utils.ActivityUtils
 import com.dahe.mylibrary.utils.ConvertUtils
-import com.flyco.tablayout.CommonTabLayout
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.schedulers.Schedulers
 import org.greenrobot.eventbus.EventBus
@@ -135,21 +134,14 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(), RefreshCallBack {
                     mContext,
                     WaybillDetailActivity::class.java,
                     Bundle().apply { putString(AppConfig.ORDER_ID, items[position].orderId) })
-
-
+            }
+            addOnItemChildClickListener(R.id.btnOk) { adapter, view, position ->
+                OrderUtils.getInstance().goReceWaybill(mContext,  items[position].orderId)
 //                ActivityUtils.startActivity(
 //                    mContext,
 //                    WaybillDetailActivity::class.java,
 //                    Bundle().apply { putString(AppConfig.ORDER_ID, items[position].orderId) })
             }
-            addOnItemChildClickListener(R.id.btnOk) { adapter, view, position ->
-
-                ActivityUtils.startActivity(
-                    mContext,
-                    WaybillDetailActivity::class.java,
-                    Bundle().apply { putString(AppConfig.ORDER_ID, items[position].orderId) })
-//                ActivityUtils.startActivity(mContext, WaybillDetailActivity::class.java)
-            }
         }
 
     }
diff --git a/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillDetailActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillDetailActivity.kt
index c1eaca6..122864c 100644
--- a/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillDetailActivity.kt
+++ b/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillDetailActivity.kt
@@ -21,6 +21,7 @@ import com.dahe.gldriver.net.DataManager
 import com.dahe.gldriver.net.RxHttpCallBack
 import com.dahe.gldriver.utils.GDLocationUtils
 import com.dahe.gldriver.utils.LocationUtils
+import com.dahe.gldriver.utils.OrderUtils
 import com.dahe.glex.bean.OrderBean
 import com.dahe.mylibrary.base.BaseActivity
 import com.dahe.mylibrary.net.CommonResponseBean
@@ -54,14 +55,16 @@ class WaybillDetailActivity : BaseActivity<ActivityWaybillDetailBinding>() {
             BaseUtils.callPhone(this@WaybillDetailActivity, "15838201105")
         }
         binding.btnReceiving.setOnClickListener {
-            DataManager.getInstance().receivingOrders(orderId, "22")
-                .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread())
-                .subscribe(BaseObserver(mContext, object : RxHttpCallBack<String>() {
-                    override fun onSuccess(t: CommonResponseBean<String>) {
-                        super.onSuccess(t)
-                        EventBus.getDefault().post(OrderStauEvent(1))
-                    }
-                }))
+            OrderUtils.getInstance().goReceWaybill(mContext,  orderId)
+
+//            DataManager.getInstance().receivingOrders(orderId, "22")
+//                .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread())
+//                .subscribe(BaseObserver(mContext, object : RxHttpCallBack<String>() {
+//                    override fun onSuccess(t: CommonResponseBean<String>) {
+//                        super.onSuccess(t)
+//                        EventBus.getDefault().post(OrderStauEvent(1))
+//                    }
+//                }))
 
         }
 
@@ -150,52 +153,6 @@ class WaybillDetailActivity : BaseActivity<ActivityWaybillDetailBinding>() {
         }
     }
 
-
-//    private fun initXml(data: OrderDetailBean) {
-//        val load = data.orderChildList.find { it.type == "1" }
-//        val unLoad = data.orderChildList.find { it.type == "2" }
-//
-//        binding.run {
-//            tvTime.text = data.receiverDeadline
-//            tvType.text = if (data.orderType == "0") "一装一卸" else "一装多卸"
-//            tvLoad.text = load?.address
-//            tvPhone.text = """${load?.name} ${load?.phone}"""
-//
-//            tvUnload.text = unLoad?.address
-//            tvUnloadPhone.text = """${unLoad?.name} ${unLoad?.phone}"""
-//
-//
-//            tvCom.text = data?.receiverBusinessName
-//            tvConsignor.text = data?.realCompanyName
-//            tvFreight.text = data?.driverFreight.toString()
-//
-//
-//
-//
-//
-//            btnCall.setOnClickListener {
-//
-//                PermissionX.init(this@WaybillDetailActivity)
-//                    .permissions(Manifest.permission.CALL_PHONE)
-//                    .request { allGranted, grantedList, deniedList ->
-//                        if (allGranted) {
-//                            BaseUtils.callPhone(
-//                                this@WaybillDetailActivity,
-//                                data.shipperContactPhone
-//                            )
-//                        } else {
-//                            Toast.makeText(
-//                                mContext,
-//                                "开启权限失败,请在应用设置-权限中打开电话权限",
-//                                Toast.LENGTH_SHORT
-//                            ).show()
-//                        }
-//                    }
-//
-//            }
-//        }
-//    }
-
     var adapter: WaybillNodeAdapter? = null
     private fun initRecy() {
         adapter = binding.recycler.run {
@@ -223,4 +180,8 @@ class WaybillDetailActivity : BaseActivity<ActivityWaybillDetailBinding>() {
         }
 
     }
+
+    private fun receWaybill(){
+
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillLoadActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillLoadActivity.kt
index bb71309..7ac9627 100644
--- a/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillLoadActivity.kt
+++ b/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillLoadActivity.kt
@@ -41,7 +41,6 @@ class WaybillLoadActivity : BaseActivity<ActivityWaybillLoadBinding>() {
     var aMap: AMap? = null
 
     var orderId: String = ""
-    var waybillId: String = ""
     lateinit var orderBean: OrderDetailBean
     override fun initView(savedInstanceState: Bundle?) {
 
diff --git a/app/src/main/java/com/dahe/gldriver/utils/CommonPopUtils.kt b/app/src/main/java/com/dahe/gldriver/utils/CommonPopUtils.kt
index d9ac553..ad90517 100644
--- a/app/src/main/java/com/dahe/gldriver/utils/CommonPopUtils.kt
+++ b/app/src/main/java/com/dahe/gldriver/utils/CommonPopUtils.kt
@@ -1,6 +1,12 @@
 package com.dahe.gldriver.utils
 
+import android.content.Context
+import com.dahe.gldriver.bean.CarBean
+import com.dahe.gldriver.mypop.OnCarSelectListener
+import com.dahe.gldriver.mypop.PopBottomCar
 import com.dahe.mylibrary.base.SingletonNoPHolder
+import com.lxj.xpopup.XPopup
+import com.lxj.xpopup.interfaces.OnConfirmListener
 
 /**
  * @ClassName CommonPopUtils
@@ -8,10 +14,36 @@ import com.dahe.mylibrary.base.SingletonNoPHolder
  * @Date 2024/3/5 15:48
  * @Description TODO
  */
-class CommonPopUtils private constructor(){
+class CommonPopUtils private constructor() {
 
     companion object : SingletonNoPHolder<CommonPopUtils>(::CommonPopUtils)
 
 
+    /**
+     * 选择车辆
+     * */
+    fun showCarList(context: Context, cars: MutableList<CarBean>, listener: OnCarSelectListener) {
+        XPopup.Builder(context)
+            .isViewMode(true)
+//            .isDestroyOnDismiss(true) //对于只使用一次的弹窗，推荐设置这个
+            .asCustom(PopBottomCar(context, cars, listener))
+            .show()
+    }
+
+
+    /**
+     * 装货弹框
+     * */
+    fun showLoadPop(context: Context,carBean: CarBean ,listener: OnConfirmListener) {
+        XPopup.Builder(context)
+            .isDestroyOnDismiss(true)
+            .asConfirm(
+                "去装货", """已选择:${carBean.vehicleNum},是否立即装货""",
+                "取消", "确定",
+                listener, null, true
+            )
+            .show()
+    }
+
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/dahe/gldriver/utils/OrderUtils.kt b/app/src/main/java/com/dahe/gldriver/utils/OrderUtils.kt
index 3813108..605bf6a 100644
--- a/app/src/main/java/com/dahe/gldriver/utils/OrderUtils.kt
+++ b/app/src/main/java/com/dahe/gldriver/utils/OrderUtils.kt
@@ -1,6 +1,20 @@
 package com.dahe.gldriver.utils
 
+import android.content.Context
+import android.os.Bundle
+import com.dahe.gldriver.base.AppConfig
+import com.dahe.gldriver.bean.CarBean
+import com.dahe.gldriver.event.OrderStauEvent
+import com.dahe.gldriver.net.BaseObserver
+import com.dahe.gldriver.net.DataManager
+import com.dahe.gldriver.net.RxHttpCallBack
+import com.dahe.gldriver.ui.waybill.activity.WaybillLoadActivity
 import com.dahe.mylibrary.base.SingletonNoPHolder
+import com.dahe.mylibrary.net.CommonResponseBean
+import com.dahe.mylibrary.utils.ActivityUtils
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.schedulers.Schedulers
+import org.greenrobot.eventbus.EventBus
 
 /**
  * @ClassName OrderUtils
@@ -64,4 +78,62 @@ class OrderUtils private constructor() {
             }
         }
     }
+
+
+    /**
+     *
+     * 接单（包含选择车辆）->装货
+     * */
+    fun goReceWaybill(context: Context, orderId: String) {
+        //选择车辆
+        DataManager.getInstance().carList()
+            .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread())
+            .subscribe(
+                BaseObserver(context, object : RxHttpCallBack<MutableList<CarBean>>() {
+                    override fun onSuccess(t: CommonResponseBean<MutableList<CarBean>>) {
+                        super.onSuccess(t)
+                        if (t.data.size > 0) {//多辆车需选择车辆,单个车辆直接接单
+                            CommonPopUtils.getInstance()
+                                .showCarList(context, t.data) {
+                                    //接单接口
+                                    receivingOrders(context, orderId, it)
+                                }
+                        } else {
+                            //单量车，直接默认当前车辆 ，接单接口
+                            receivingOrders(context, orderId, t.data[0])
+                        }
+                    }
+                })
+            )
+    }
+
+    /**
+     *
+     *调用接单接口
+     * */
+    private fun receivingOrders(context: Context, orderId: String, car: CarBean) {
+        DataManager.getInstance()
+            .receivingOrders(orderId, car.carId)
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(
+                BaseObserver(
+                    context,
+                    object : RxHttpCallBack<String>() {
+                        override fun onSuccess(t: CommonResponseBean<String>) {
+                            super.onSuccess(t)
+                            //接单成功，弹窗是否去装货
+                            CommonPopUtils.getInstance()
+                                .showLoadPop(context, car) {
+                                    ActivityUtils.startActivity(context,
+                                        WaybillLoadActivity::class.java,
+                                        Bundle().apply {
+                                            putString(AppConfig.ORDER_ID, orderId)
+                                        }
+                                    )
+                                }
+                        }
+                    })
+            )
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/select_car_bg.xml b/app/src/main/res/drawable/select_car_bg.xml
new file mode 100644
index 0000000..bf1e709
--- /dev/null
+++ b/app/src/main/res/drawable/select_car_bg.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/shape_gray_5" android:state_selected="false"></item>
+    <item android:drawable="@drawable/shape_select_5" android:state_selected="true"></item>
+    <item android:drawable="@drawable/shape_gray_5"></item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_select_5.xml b/app/src/main/res/drawable/shape_select_5.xml
new file mode 100644
index 0000000..a5b33f3
--- /dev/null
+++ b/app/src/main/res/drawable/shape_select_5.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:angle="90"
+        android:endColor="#FAAE90"
+        android:startColor="#FFE1D5"
+        android:type="linear"
+        android:useLevel="true" />
+    <corners
+        android:bottomLeftRadius="5dp"
+        android:bottomRightRadius="5dp"
+        android:topLeftRadius="5dp"
+        android:topRightRadius="5dp" />
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/choice_car.xml b/app/src/main/res/layout/choice_car.xml
new file mode 100644
index 0000000..1c6aa45
--- /dev/null
+++ b/app/src/main/res/layout/choice_car.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/bg_bai"
+    android:orientation="vertical">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginTop="@dimen/dp_16"
+        android:layout_marginBottom="@dimen/dp_20"
+        android:text="选择车辆"
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_18" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/dp_12"
+        android:layout_marginRight="@dimen/dp_12" />
+
+
+    <Button
+        android:id="@+id/btnOk"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/dp_20"
+        android:layout_marginTop="@dimen/dp_20"
+        android:layout_marginRight="@dimen/dp_20"
+        android:layout_marginBottom="@dimen/dp_20"
+        android:background="@drawable/shape_ok_bg"
+        android:text="接单"
+        android:textColor="@color/white"
+        android:textSize="@dimen/sp_17" />
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_car.xml b/app/src/main/res/layout/item_car.xml
new file mode 100644
index 0000000..7adb6c8
--- /dev/null
+++ b/app/src/main/res/layout/item_car.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/select_car_bg"
+    android:orientation="vertical"
+    android:paddingLeft="@dimen/dp_15"
+    android:paddingTop="@dimen/dp_20"
+    android:id="@+id/llContent"
+    android:paddingRight="@dimen/dp_15"
+    android:paddingBottom="@dimen/dp_20">
+
+    <TextView
+        android:id="@+id/tvCarNum"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="豫A4854S"
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_18" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_12"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/tvCarType"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="重型栏板半挂车"
+            android:textColor="@color/color_9"
+            android:textSize="@dimen/sp_14" />
+
+        <TextView
+            android:id="@+id/tvCarLen"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="车长：16米"
+            android:textColor="@color/color_9"
+            android:textSize="@dimen/sp_14" />
+
+        <TextView
+            android:id="@+id/tvCarWei"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="核定载重：40吨"
+            android:textColor="@color/color_9"
+            android:textSize="@dimen/sp_14" />
+
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/mylibrary/src/main/java/com/dahe/mylibrary/bean/CarBean.java b/mylibrary/src/main/java/com/dahe/mylibrary/bean/CarBean.java
deleted file mode 100644
index 1691809..0000000
--- a/mylibrary/src/main/java/com/dahe/mylibrary/bean/CarBean.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.dahe.mylibrary.bean;
-
-import java.io.Serializable;
-
-public class CarBean implements Serializable {
-
-
-//    private String approved_load;
-//    private String driver_name;
-//    private String current_load;
-//    private String car_number;
-//    private String outline_wide;
-//    private String outline_long;
-//    private String driver_phone;
-//    private Integer car_id;
-//    private String outline_high;
-    private boolean isSelect;
-
-    private String vehicle;
-    private String carId;
-    private String outlineWide;
-    private String outlineHigh;
-    private String outlineLong;
-    private String approvedLoad;
-    private String driverName;
-    private String driverPhone;
-
-    public String getVehicle() {
-        return vehicle;
-    }
-
-    public void setVehicle(String vehicle) {
-        this.vehicle = vehicle;
-    }
-
-    public String getCarId() {
-        return carId;
-    }
-
-    public void setCarId(String carId) {
-        this.carId = carId;
-    }
-
-    public String getOutlineWide() {
-        return outlineWide;
-    }
-
-    public void setOutlineWide(String outlineWide) {
-        this.outlineWide = outlineWide;
-    }
-
-    public String getOutlineHigh() {
-        return outlineHigh;
-    }
-
-    public void setOutlineHigh(String outlineHigh) {
-        this.outlineHigh = outlineHigh;
-    }
-
-    public String getOutlineLong() {
-        return outlineLong;
-    }
-
-    public void setOutlineLong(String outlineLong) {
-        this.outlineLong = outlineLong;
-    }
-
-    public String getApprovedLoad() {
-        return approvedLoad;
-    }
-
-    public void setApprovedLoad(String approvedLoad) {
-        this.approvedLoad = approvedLoad;
-    }
-
-    public String getDriverName() {
-        return driverName;
-    }
-
-    public void setDriverName(String driverName) {
-        this.driverName = driverName;
-    }
-
-    public String getDriverPhone() {
-        return driverPhone;
-    }
-
-    public void setDriverPhone(String driverPhone) {
-        this.driverPhone = driverPhone;
-    }
-
-    public boolean isSelect() {
-        return isSelect;
-    }
-
-    public void setSelect(boolean select) {
-        isSelect = select;
-    }
-
-}
diff --git a/mylibrary/src/main/res/drawable/bg_bai.xml b/mylibrary/src/main/res/drawable/bg_bai.xml
index dab80cd..5b6d82c 100644
--- a/mylibrary/src/main/res/drawable/bg_bai.xml
+++ b/mylibrary/src/main/res/drawable/bg_bai.xml
@@ -2,7 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
     <corners android:topLeftRadius="@dimen/dp_8"
         android:topRightRadius="@dimen/dp_8"
-        android:bottomLeftRadius="@dimen/dp_8"
-        android:bottomRightRadius="@dimen/dp_8"/>
+        />
     <solid android:color="#fff"/>
 </shape>
\ No newline at end of file