From 632bfc4912116fa34a00f0d1e68589473b2773e9 Mon Sep 17 00:00:00 2001 From: lijia Date: Wed, 17 Apr 2024 14:44:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E7=AE=A1=E7=90=86=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dahe/gldriver/adapter/CarsAdapter.kt | 4 +- .../gldriver/adapter/DriverCarsAdapter.kt | 51 +++++++ .../java/com/dahe/gldriver/bean/CarBean.kt | 3 + .../ui/mine/activity/CarTeamManActivity.kt | 13 ++ .../ui/mine/activity/CarsManActivity.kt | 2 +- .../ui/mine/fragment/CarsManFragment.kt | 7 +- .../com/dahe/gldriver/utils/OrderUtils.kt | 18 ++- app/src/main/res/layout/activity_car_team.xml | 1 + app/src/main/res/layout/item_driver_cars.xml | 133 ++++++++++++++++++ 9 files changed, 221 insertions(+), 11 deletions(-) create mode 100644 app/src/main/java/com/dahe/gldriver/adapter/DriverCarsAdapter.kt create mode 100644 app/src/main/res/layout/item_driver_cars.xml diff --git a/app/src/main/java/com/dahe/gldriver/adapter/CarsAdapter.kt b/app/src/main/java/com/dahe/gldriver/adapter/CarsAdapter.kt index b1c5784..523f002 100644 --- a/app/src/main/java/com/dahe/gldriver/adapter/CarsAdapter.kt +++ b/app/src/main/java/com/dahe/gldriver/adapter/CarsAdapter.kt @@ -15,7 +15,7 @@ import com.dahe.mylibrary.utils.ImageLoader * @Date 2024/1/23 16:27 * @Description TODO */ -class CarsAdapter(private var isCanUnbind: Boolean) : +class CarsAdapter() : BaseQuickAdapter() { override fun onBindViewHolder(holder: QuickViewHolder, position: Int, item: CarBean?) { holder.run { @@ -31,8 +31,6 @@ class CarsAdapter(private var isCanUnbind: Boolean) : }吨""" ) - setGone(R.id.tvUnbind,!isCanUnbind) - ImageLoader.getInstance() .loadRoundImage(context, item?.carUrl, 6, getView(R.id.ivHead)) } diff --git a/app/src/main/java/com/dahe/gldriver/adapter/DriverCarsAdapter.kt b/app/src/main/java/com/dahe/gldriver/adapter/DriverCarsAdapter.kt new file mode 100644 index 0000000..fc5ffea --- /dev/null +++ b/app/src/main/java/com/dahe/gldriver/adapter/DriverCarsAdapter.kt @@ -0,0 +1,51 @@ +package com.dahe.gldriver.adapter + +import android.content.Context +import android.view.ViewGroup +import android.widget.ImageView +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.mylibrary.utils.ImageLoader + +/** + * @ClassName WaybillAdapter + * @Author 用户 + * @Date 2024/1/23 16:27 + * @Description TODO + */ +class DriverCarsAdapter() : + BaseQuickAdapter() { + 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.tvDriverName, item?.idcardName) + setText(R.id.tvPhone, item?.contactPhone) + setText(R.id.tvCarLen, """${if (!item?.carLong.isNullOrEmpty()) item?.carLong else ""}mm""") + setText( + R.id.tvCarWei, + """${ + if (!item?.approvedLoad.isNullOrEmpty()) item?.approvedLoad?.toFloat() + ?.div(1000) else if (!item?.tractionWeight.isNullOrEmpty()) item?.tractionWeight?.toFloat() + ?.div(1000) else 0 + }吨""" + ) + + ImageLoader.getInstance() + .loadRoundImage(context, item?.carUrl, 6, getView(R.id.ivHead)) + ImageLoader.getInstance() + .loadRoundImage(context, item?.avatar, 6, getView(R.id.ivDriverHead)) + } + } + + override fun onCreateViewHolder( + context: Context, + parent: ViewGroup, + viewType: Int + ): QuickViewHolder { + // 返回一个 ViewHolder + return QuickViewHolder(R.layout.item_driver_cars, 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 index ee74c34..84bcd90 100644 --- a/app/src/main/java/com/dahe/gldriver/bean/CarBean.kt +++ b/app/src/main/java/com/dahe/gldriver/bean/CarBean.kt @@ -30,6 +30,9 @@ data class CarBean( var vehicleNum: String="", val vehicleType: String="", val vehicleTypeCode: String="", + val idcardName: String="", + val contactPhone: String="", + val avatar: String="", var isSelect: Boolean = false ) diff --git a/app/src/main/java/com/dahe/gldriver/ui/mine/activity/CarTeamManActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/mine/activity/CarTeamManActivity.kt index 782217a..02561a8 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/mine/activity/CarTeamManActivity.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/mine/activity/CarTeamManActivity.kt @@ -12,6 +12,7 @@ import com.dahe.gldriver.databinding.ActivityCarTeamBinding import com.dahe.gldriver.net.BaseObserver import com.dahe.gldriver.net.DataManager import com.dahe.gldriver.net.RxHttpCallBack +import com.dahe.gldriver.ui.account.authteam.EditCaTeamActivity import com.dahe.gldriver.ui.mine.InviteRecordActivity import com.dahe.gldriver.ui.mine.fragment.CarsManFragment import com.dahe.gldriver.ui.mine.fragment.DriversManFragment @@ -114,6 +115,18 @@ class CarTeamManActivity : BaseActivity() { binding.magicIndicator.navigator = commonNavigator mFragmentContainerHelper.attachMagicIndicator(binding.magicIndicator) + + binding.run { + llTeam.setOnClickListener { + val userInfo = SPUtils.instance.getUserInfo(mContext) + ActivityUtils.startActivity( + mContext, + EditCaTeamActivity::class.java, + Bundle().apply { + putString(AppConfig.ID, userInfo.captainId) + }) + } + } } override fun initDate() { diff --git a/app/src/main/java/com/dahe/gldriver/ui/mine/activity/CarsManActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/mine/activity/CarsManActivity.kt index 9f70182..223b92d 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/mine/activity/CarsManActivity.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/mine/activity/CarsManActivity.kt @@ -47,7 +47,7 @@ class CarsManActivity : BaseActivity() { Color.TRANSPARENT ) ) - adapter = CarsAdapter(true) + adapter = CarsAdapter() adapter as CarsAdapter }.apply { isStateViewEnable = true diff --git a/app/src/main/java/com/dahe/gldriver/ui/mine/fragment/CarsManFragment.kt b/app/src/main/java/com/dahe/gldriver/ui/mine/fragment/CarsManFragment.kt index 2bfbe89..713f838 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/mine/fragment/CarsManFragment.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/mine/fragment/CarsManFragment.kt @@ -7,6 +7,7 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.dahe.gldriver.R import com.dahe.gldriver.adapter.CarsAdapter +import com.dahe.gldriver.adapter.DriverCarsAdapter import com.dahe.gldriver.base.AppConfig import com.dahe.gldriver.bean.CarBean import com.dahe.gldriver.databinding.FragmentWaybillListBinding @@ -29,7 +30,7 @@ import io.reactivex.rxjava3.schedulers.Schedulers */ class CarsManFragment : BaseFragment(), RefreshCallBack { private var captainId: String = "" - lateinit var adapter: CarsAdapter + lateinit var adapter: DriverCarsAdapter override fun onFragmentVisibleChange(isVisible: Boolean) { } @@ -48,8 +49,8 @@ class CarsManFragment : BaseFragment(), RefreshCallB Color.TRANSPARENT ) ) - adapter = CarsAdapter(false) - adapter as CarsAdapter + adapter = DriverCarsAdapter() + adapter as DriverCarsAdapter }.apply { isStateViewEnable = true } 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 0c95d71..b28ca3a 100644 --- a/app/src/main/java/com/dahe/gldriver/utils/OrderUtils.kt +++ b/app/src/main/java/com/dahe/gldriver/utils/OrderUtils.kt @@ -21,6 +21,7 @@ import com.dahe.mylibrary.base.SingletonNoPHolder import com.dahe.mylibrary.net.CommonResponseBean import com.dahe.mylibrary.utils.ActivityUtils import com.dahe.mylibrary.utils.BaseSPUtils +import com.dahe.mylibrary.utils.ToastUtils import com.google.gson.Gson import com.gyf.cactus.Cactus import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers @@ -102,6 +103,10 @@ class OrderUtils private constructor() { BaseObserver(context, object : RxHttpCallBack>() { override fun onSuccess(t: CommonResponseBean>) { super.onSuccess(t) + if (t.data != null) { + ToastUtils.showToast(context, "暂未查询到车辆") + return + } if (t.data.size > 0) {//多辆车需选择车辆,单个车辆直接接单 CommonPopUtils.getInstance() .showCarList(context, t.data) { @@ -164,11 +169,16 @@ class OrderUtils private constructor() { .subscribe(BaseObserver(context, object : RxHttpCallBack() { override fun onSuccess(t: CommonResponseBean) { super.onSuccess(t) - if (t.data != null&&!t.data.orderId.isNullOrEmpty()) { + if (t.data != null && !t.data.orderId.isNullOrEmpty()) { BaseSPUtils.put(context, NEED_UP_ORDER, Gson().toJson(t.data)) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - context.startForegroundService(Intent(context, UpLocationService2::class.java)) - }else{ + context.startForegroundService( + Intent( + context, + UpLocationService2::class.java + ) + ) + } else { context.startService(Intent(context, UpLocationService2::class.java)) } } else { @@ -184,7 +194,7 @@ class OrderUtils private constructor() { * 关闭上传运行中运单轨迹 * @param context Context */ - fun stopUpLocation(context: Context){ + fun stopUpLocation(context: Context) { context.stopService(Intent(context, UpLocationService2::class.java)) } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_car_team.xml b/app/src/main/res/layout/activity_car_team.xml index 9207385..87f9961 100644 --- a/app/src/main/res/layout/activity_car_team.xml +++ b/app/src/main/res/layout/activity_car_team.xml @@ -31,6 +31,7 @@ app:cardCornerRadius="@dimen/dp_8"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file