From afcd241bbf08412533045e7c51498ca210a49729 Mon Sep 17 00:00:00 2001 From: lijia Date: Wed, 17 Apr 2024 11:10:55 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E9=98=9F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dahe/gldriver/adapter/CarsAdapter.kt | 6 +- .../java/com/dahe/gldriver/bean/CarBean.kt | 12 +- .../java/com/dahe/gldriver/bean/UpInfoBean.kt | 1 + .../main/java/com/dahe/gldriver/net/Api.kt | 13 +- .../ui/account/authteam/EditCaTeamActivity.kt | 145 ++++++++---------- .../gldriver/ui/mine/InviteDriverActivity.kt | 2 - .../gldriver/ui/mine/InviteRecordActivity.kt | 4 - .../com/dahe/gldriver/ui/mine/MineFragment.kt | 22 ++- .../ui/mine/activity/CarsManActivity.kt | 10 +- .../ui/mine/activity/ComProActivity.kt | 1 - .../ui/mine/activity/WalletActivity.kt | 3 - .../ui/mine/fragment/CarsManFragment.kt | 14 +- .../ui/mine/fragment/DriversManFragment.kt | 10 -- .../res/layout/activity_auth_team_edit.xml | 5 +- 14 files changed, 117 insertions(+), 131 deletions(-) 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 8aa7d9d..b1c5784 100644 --- a/app/src/main/java/com/dahe/gldriver/adapter/CarsAdapter.kt +++ b/app/src/main/java/com/dahe/gldriver/adapter/CarsAdapter.kt @@ -2,13 +2,11 @@ package com.dahe.gldriver.adapter import android.content.Context import android.view.ViewGroup -import android.widget.Button 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.glex.bean.WayBillBean import com.dahe.mylibrary.utils.ImageLoader /** @@ -17,7 +15,7 @@ import com.dahe.mylibrary.utils.ImageLoader * @Date 2024/1/23 16:27 * @Description TODO */ -class CarsAdapter : +class CarsAdapter(private var isCanUnbind: Boolean) : BaseQuickAdapter() { override fun onBindViewHolder(holder: QuickViewHolder, position: Int, item: CarBean?) { holder.run { @@ -33,6 +31,8 @@ class CarsAdapter : }吨""" ) + 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/bean/CarBean.kt b/app/src/main/java/com/dahe/gldriver/bean/CarBean.kt index 7aedd2e..ee74c34 100644 --- a/app/src/main/java/com/dahe/gldriver/bean/CarBean.kt +++ b/app/src/main/java/com/dahe/gldriver/bean/CarBean.kt @@ -57,4 +57,14 @@ data class CarDetail( val vehicleNum: String, val vehicleType: String, val vehicleTypeCode: String -) \ No newline at end of file +) +data class CapCarListBean( + val avatar: String, + val carList: List, + val contactName: String, + val contactPhone: String, + val driverId: Int, + val idcardName: String, + val idcardSex: String +) + diff --git a/app/src/main/java/com/dahe/gldriver/bean/UpInfoBean.kt b/app/src/main/java/com/dahe/gldriver/bean/UpInfoBean.kt index f2d86eb..9e51b5a 100644 --- a/app/src/main/java/com/dahe/gldriver/bean/UpInfoBean.kt +++ b/app/src/main/java/com/dahe/gldriver/bean/UpInfoBean.kt @@ -131,6 +131,7 @@ data class AuthTeamBean( var captainBankcardAddress: String="", var captainBankcardNumber: String="", var captainBankcardName: String="", + var captainName: String="", var captainBankcardPhotoUrl: String="", var captainType: String="",//类型(0=个人，1=企业) var idcardAddress: String="", 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 e3fdd59..8d6b225 100644 --- a/app/src/main/java/com/dahe/gldriver/net/Api.kt +++ b/app/src/main/java/com/dahe/gldriver/net/Api.kt @@ -438,8 +438,8 @@ interface Api { * 根据ID查询车队车辆列表-根据司机分页 * @return Observable>> */ - @GET(BASE_URL + "driver/captain/selectDriverIdsForCarPage") - fun selectDriverIdsForCarPage(@Query("captainId") captainId: String): Observable>> + @GET(BASE_URL + "driver/captain/selectCarsList") + fun selectCarsList(@Query("captainId") captainId: String): Observable>> /** * 根据ID查询车队信息 @@ -449,6 +449,15 @@ interface Api { @GET(BASE_URL + "driver/captain/getCaptainById") fun getCaptainById(@Query("captainId") captainId: String): Observable> + + /** + * 查询车队详情（证件） + * @param captainId String + * @return Observable> + */ + @GET(BASE_URL+"driver/captain/getCaptainDetail") + fun getCaptainDetail(@Query("captainId") captainId: String): Observable> + /** * 查询车辆证件完整度 * @param captainId String diff --git a/app/src/main/java/com/dahe/gldriver/ui/account/authteam/EditCaTeamActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/account/authteam/EditCaTeamActivity.kt index 1c6f599..bcc41da 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/account/authteam/EditCaTeamActivity.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/account/authteam/EditCaTeamActivity.kt @@ -3,9 +3,9 @@ package com.dahe.gldriver.ui.account.authteam import android.os.Bundle import android.view.View import com.dahe.gldriver.R +import com.dahe.gldriver.base.AppConfig import com.dahe.gldriver.bean.AuthTeamBean -import com.dahe.gldriver.bean.OcrPersonBean -import com.dahe.gldriver.databinding.ActivityAuthTeamBinding +import com.dahe.gldriver.databinding.ActivityAuthTeamEditBinding import com.dahe.gldriver.net.BaseObserver import com.dahe.gldriver.net.DataManager import com.dahe.gldriver.net.RxHttpCallBack @@ -17,7 +17,6 @@ import com.dahe.mylibrary.net.CommonResponseBean import com.dahe.mylibrary.utils.ActivityUtils import com.dahe.mylibrary.utils.ImageLoader import com.dahe.mylibrary.utils.PickerUtils -import com.dahe.mylibrary.utils.PopsUtils import com.dahe.mylibrary.utils.TimeUtil import com.dahe.mylibrary.utils.ToastUtils import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers @@ -29,7 +28,7 @@ import io.reactivex.rxjava3.schedulers.Schedulers * @Date 2024/1/25 16:44 * @Description 个人车队-编辑 */ -class EditCaTeamActivity : BaseActivity(), View.OnClickListener { +class EditCaTeamActivity : BaseActivity(), View.OnClickListener { private var checkTeamType = 1 //1代表运输公司，0代表个人车队 var ossServiceUtil: OssServiceUtil = OssServiceUtil.getInstance() @@ -41,9 +40,6 @@ class EditCaTeamActivity : BaseActivity(), View.OnClick setStatusBarColor(R.color.white) setTitleBar("身份认证", true) binding.run { - rgTeam.setOnCheckedChangeListener { _, i -> - changeTeamType(if (i == binding.rbCom.id) 1 else 0) - } //营业执照选择。ocr识别 ivBusiness.setOnClickListener { OcrUtils.getInstance() @@ -274,14 +270,76 @@ class EditCaTeamActivity : BaseActivity(), View.OnClick } override fun initDate() { + val capId = intent.extras!!.getString(AppConfig.ID, "") + DataManager.getInstance().getCaptainDetail(capId) + .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()) + .subscribe(BaseObserver(mContext, object : RxHttpCallBack() { + override fun onSuccess(t: CommonResponseBean) { + super.onSuccess(t) + if (t.data == null) { + return + } + initViewByData(t.data) + } + })) + } - private fun changeTeamType(type: Int) { + private fun initViewByData(data: AuthTeamBean) { + changeTeamType(data.captainType.toInt(),data) + binding.run { + if (data.captainType == "1") {//1企业车队 + ImageLoader.getInstance() + .loadRoundImage(mContext, data.businessLicensePhoneUrl, 12, ivBusiness) + ImageLoader.getInstance() + .loadRoundImage(mContext, data.roadLicensePhotoUrl, 12, ivRoad) + + ImageLoader.getInstance() + .loadRoundImage(mContext, data.captainBankcardPhotoUrl, 12, binding.ivComBank) + + ImageLoader.getInstance() + .loadRoundImage(mContext, data.idcardFrontUrl, 12, binding.ivComFront) + ImageLoader.getInstance() + .loadRoundImage(mContext, data.idcardBackUrl, 12, binding.ivComBack) + + etRootId.setText(data.roadLicense) + tvComDate.text = data.roadLicenseValidity + + etComBankId.setText(data.captainBankcardNumber) + etComBankName.setText(data.captainBankcardName) + + etName.setText(data.idcardName) + etId.setText(data.idcardNo) + tvStart.text = data.idcardEffectiveStart + tvEnd.text = if (data.idcardIsEndless == "1") "长期" else data.idcardEffectiveEnd + + } else { + ImageLoader.getInstance() + .loadRoundImage(mContext, data.idcardFrontUrl, 12, binding.ivFront) + ImageLoader.getInstance() + .loadRoundImage(mContext, data.idcardBackUrl, 12, binding.ivBack) + ImageLoader.getInstance() + .loadRoundImage(mContext, data.captainBankcardPhotoUrl, 12, binding.ivBank) + + etPerName.setText(data.idcardName) + etPerId.setText(data.idcardNo) + tvPerStart.text = data.idcardEffectiveStart + tvPerEnd.text = if (data.idcardIsEndless == "1") "长期" else data.idcardEffectiveEnd + + etPerBankId.setText(data.captainBankcardNumber) + tvPerBankName.setText(data.captainBankcardName) + } + } + } + + private fun changeTeamType(type: Int, data: AuthTeamBean) { checkTeamType = type if (1 == checkTeamType) { + upComInfoBean = data binding.llCom.visibility = View.VISIBLE binding.llPerson.visibility = View.GONE } else { + upPerInfoBean = data binding.llCom.visibility = View.GONE binding.llPerson.visibility = View.VISIBLE } @@ -381,76 +439,5 @@ class EditCaTeamActivity : BaseActivity(), View.OnClick } - - private fun selBankPic(picType: Int = 0) { - PopsUtils.getInstance().showSimSelPic(mContext) { it -> - ossServiceUtil.run { - asyncPutImage(it[0].realPath, this@EditCaTeamActivity) - setResultCallBack { data, oldPath -> - DataManager.getInstance().recognizeBankCard(oldPath) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe( - BaseObserver(mContext, - object : RxHttpCallBack(this@EditCaTeamActivity) { - override fun onSuccess(t: CommonResponseBean) { - super.onSuccess(t) - t.data.data?.run { -// bankInfo.driverBankcardPhotoUrl = oldPath - - binding.let { - it.etComBankId.setText(cardNumber) - it.etComBankName.setText(bankName) - } - } - - } - }) - ) - - } - } - ImageLoader.getInstance() - .loadRoundImage(mContext, it[0].realPath, 12, binding.ivComBank) - } - } - - private fun selPerPic() { - PopsUtils.getInstance().showSimSelPic(mContext) { - - ImageLoader.getInstance().loadRoundImage(mContext, it[0].realPath, 12, binding.ivFront) - - ossServiceUtil.run { - asyncPutImage(it[0].realPath, this@EditCaTeamActivity) - setResultCallBack { data, oldPath -> - DataManager.getInstance().recognizeIdcard(oldPath) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe( - BaseObserver(mContext, - object : RxHttpCallBack(this@EditCaTeamActivity) { - override fun onSuccess(t: CommonResponseBean) { - super.onSuccess(t) - t.data.data.face?.data.let { - it?.run { -// perInfoBean.run { -// idcardNo = idNumber -// idcardName = name -// idcardSex = if (sex == "男") "1" else "2" -// } - } - binding.run { - etName.setText(it?.idNumber) - etId.setText(it?.name) - } - } - - } - }) - ) - } - } - } - } } diff --git a/app/src/main/java/com/dahe/gldriver/ui/mine/InviteDriverActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/mine/InviteDriverActivity.kt index 436ea53..a2240c6 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/mine/InviteDriverActivity.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/mine/InviteDriverActivity.kt @@ -6,9 +6,7 @@ import android.widget.LinearLayout 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.DriversAdapter -import com.dahe.gldriver.base.AppConfig import com.dahe.gldriver.bean.DriverBean import com.dahe.gldriver.databinding.ActivityInviteDriverBinding import com.dahe.gldriver.net.BaseObserver diff --git a/app/src/main/java/com/dahe/gldriver/ui/mine/InviteRecordActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/mine/InviteRecordActivity.kt index 96b0d35..53f59e0 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/mine/InviteRecordActivity.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/mine/InviteRecordActivity.kt @@ -6,13 +6,9 @@ import android.widget.LinearLayout 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.DriversAdapter import com.dahe.gldriver.adapter.InviteRecordAdapter -import com.dahe.gldriver.base.AppConfig import com.dahe.gldriver.bean.DriverBean import com.dahe.gldriver.bean.InviteRecord -import com.dahe.gldriver.databinding.ActivityInviteDriverBinding import com.dahe.gldriver.databinding.ActivityInviteRecordBinding import com.dahe.gldriver.net.BaseObserver import com.dahe.gldriver.net.DataManager diff --git a/app/src/main/java/com/dahe/gldriver/ui/mine/MineFragment.kt b/app/src/main/java/com/dahe/gldriver/ui/mine/MineFragment.kt index 431cc3e..48dabee 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/mine/MineFragment.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/mine/MineFragment.kt @@ -4,6 +4,7 @@ import android.os.Bundle import android.view.View import com.dahe.gldriver.R import com.dahe.gldriver.adapter.GridItemAdapter +import com.dahe.gldriver.base.AppConfig import com.dahe.gldriver.base.WebActivity import com.dahe.gldriver.bean.GridBean import com.dahe.gldriver.bean.OcrPersonBean @@ -13,6 +14,7 @@ import com.dahe.gldriver.net.DataManager import com.dahe.gldriver.net.RxHttpCallBack import com.dahe.gldriver.oss.OssServiceUtil import com.dahe.gldriver.ui.account.authperson.AuthPartyActivity +import com.dahe.gldriver.ui.account.authteam.EditCaTeamActivity import com.dahe.gldriver.ui.mine.activity.CarTeamManActivity import com.dahe.gldriver.ui.mine.activity.CarsManActivity import com.dahe.gldriver.ui.mine.activity.ComProActivity @@ -90,7 +92,19 @@ class MineFragment : BaseFragment(), View.OnClickListener, } llPerson.setOnClickListener { - ActivityUtils.startActivity(mContext, PersonInfoActivity::class.java) + val userInfo = SPUtils.instance.getUserInfo(mContext) + + if (userInfo.isCarCaptain == "1") {//是否是车队长（0=否,1=是,9=未选择） + ActivityUtils.startActivity( + mContext, + EditCaTeamActivity::class.java, + Bundle().apply { + putString(AppConfig.ID, userInfo.captainId) + }) + } else { + ActivityUtils.startActivity(mContext, PersonInfoActivity::class.java) + } + } } } @@ -176,7 +190,7 @@ class MineFragment : BaseFragment(), View.OnClickListener, } 7 -> { - ActivityUtils.startActivity(mContext,SettingActivity::class.java) + ActivityUtils.startActivity(mContext, SettingActivity::class.java) } } @@ -186,7 +200,7 @@ class MineFragment : BaseFragment(), View.OnClickListener, getUserData() } - private fun getUserData(){ + private fun getUserData() { DataManager.getInstance().getUserInfo() .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -194,7 +208,7 @@ class MineFragment : BaseFragment(), View.OnClickListener, override fun onSuccess(t: CommonResponseBean) { super.onSuccess(t) binding.refresh.finishRefresh() - if (t==null||t.data==null) + if (t == null || t.data == null) return UserUtils.instance.updateUser(mContext, t.data) refreshView() 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 4450e12..9f70182 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 @@ -3,19 +3,16 @@ package com.dahe.gldriver.ui.mine.activity import android.graphics.Color import android.os.Bundle import android.widget.LinearLayout -import android.widget.PopupMenu 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.base.AppConfig import com.dahe.gldriver.bean.CarBean -import com.dahe.gldriver.bean.OcrPersonBean import com.dahe.gldriver.databinding.ActivityCarsManBinding import com.dahe.gldriver.net.BaseObserver import com.dahe.gldriver.net.DataManager import com.dahe.gldriver.net.RxHttpCallBack -import com.dahe.gldriver.oss.OssServiceUtil import com.dahe.gldriver.ui.account.authperson.AuthDrivingActivity import com.dahe.gldriver.utils.CommonPopUtils import com.dahe.mylibrary.base.BaseActivity @@ -23,9 +20,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.dahe.mylibrary.utils.ImageLoader -import com.dahe.mylibrary.utils.PopsUtils -import com.dahe.mylibrary.utils.ToastUtils import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import io.reactivex.rxjava3.schedulers.Schedulers @@ -53,7 +47,7 @@ class CarsManActivity : BaseActivity() { Color.TRANSPARENT ) ) - adapter = CarsAdapter() + adapter = CarsAdapter(true) adapter as CarsAdapter }.apply { isStateViewEnable = true @@ -99,7 +93,7 @@ class CarsManActivity : BaseActivity() { BaseObserver(mContext, object : RxHttpCallBack>() { override fun onSuccess(t: CommonResponseBean>) { super.onSuccess(t) - if (t.data.size == 0) { + if (t.data == null || t.data.size == 0) { adapter.submitList(null) adapter.setStateViewLayout(mContext, R.layout.empty_view) } else { diff --git a/app/src/main/java/com/dahe/gldriver/ui/mine/activity/ComProActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/mine/activity/ComProActivity.kt index a8e8cb7..d7527d2 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/mine/activity/ComProActivity.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/mine/activity/ComProActivity.kt @@ -6,7 +6,6 @@ import android.widget.LinearLayout 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.ComProAdatper import com.dahe.gldriver.base.AppConfig import com.dahe.gldriver.bean.ProBean diff --git a/app/src/main/java/com/dahe/gldriver/ui/mine/activity/WalletActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/mine/activity/WalletActivity.kt index eafe843..6fae8ca 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/mine/activity/WalletActivity.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/mine/activity/WalletActivity.kt @@ -7,10 +7,7 @@ import android.widget.LinearLayout 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.RateAdapter import com.dahe.gldriver.adapter.WalletAdapter -import com.dahe.gldriver.base.AppConfig import com.dahe.gldriver.databinding.ActivityWalletBinding import com.dahe.gldriver.net.BaseObserver import com.dahe.gldriver.net.DataManager 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 fe0fdbe..2bfbe89 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 @@ -1,32 +1,22 @@ package com.dahe.gldriver.ui.mine.fragment import android.graphics.Color -import android.os.Bundle import android.view.View import android.widget.LinearLayout import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import androidx.recyclerview.widget.RecyclerView.LayoutManager import com.dahe.gldriver.R import com.dahe.gldriver.adapter.CarsAdapter -import com.dahe.gldriver.adapter.DriversAdapter -import com.dahe.gldriver.adapter.WaybillAdapter import com.dahe.gldriver.base.AppConfig import com.dahe.gldriver.bean.CarBean -import com.dahe.gldriver.databinding.ActivityCarsManBinding import com.dahe.gldriver.databinding.FragmentWaybillListBinding import com.dahe.gldriver.net.BaseObserver import com.dahe.gldriver.net.DataManager import com.dahe.gldriver.net.RxHttpCallBack -import com.dahe.gldriver.ui.mine.InviteDriverActivity -import com.dahe.gldriver.utils.SPUtils -import com.dahe.glex.bean.WayBillBean -import com.dahe.mylibrary.base.BaseActivity import com.dahe.mylibrary.base.BaseFragment import com.dahe.mylibrary.callback.RefreshCallBack 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 io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import io.reactivex.rxjava3.schedulers.Schedulers @@ -58,7 +48,7 @@ class CarsManFragment : BaseFragment(), RefreshCallB Color.TRANSPARENT ) ) - adapter = CarsAdapter() + adapter = CarsAdapter(false) adapter as CarsAdapter }.apply { isStateViewEnable = true @@ -77,7 +67,7 @@ class CarsManFragment : BaseFragment(), RefreshCallB private fun initData() { DataManager.getInstance() - .selectDriverIdsForCarPage(captainId) + .selectCarsList(captainId) .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()) .subscribe(BaseObserver(mContext, object : RxHttpCallBack>() { override fun onSuccess(t: CommonResponseBean>) { diff --git a/app/src/main/java/com/dahe/gldriver/ui/mine/fragment/DriversManFragment.kt b/app/src/main/java/com/dahe/gldriver/ui/mine/fragment/DriversManFragment.kt index a0f33a3..4780d1e 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/mine/fragment/DriversManFragment.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/mine/fragment/DriversManFragment.kt @@ -1,29 +1,19 @@ package com.dahe.gldriver.ui.mine.fragment import android.graphics.Color -import android.opengl.Visibility -import android.os.Bundle -import android.view.View import android.widget.LinearLayout import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import androidx.recyclerview.widget.RecyclerView.LayoutManager import com.dahe.gldriver.R -import com.dahe.gldriver.adapter.CarsAdapter import com.dahe.gldriver.adapter.DriversAdapter -import com.dahe.gldriver.adapter.WaybillAdapter import com.dahe.gldriver.base.AppConfig import com.dahe.gldriver.bean.DriverBean -import com.dahe.gldriver.databinding.ActivityCarsManBinding import com.dahe.gldriver.databinding.FragmentWaybillListBinding import com.dahe.gldriver.net.BaseObserver import com.dahe.gldriver.net.DataManager import com.dahe.gldriver.net.RxHttpCallBack import com.dahe.gldriver.ui.mine.InviteDriverActivity -import com.dahe.gldriver.utils.SPUtils import com.dahe.glex.bean.UserDetail -import com.dahe.glex.bean.WayBillBean -import com.dahe.mylibrary.base.BaseActivity import com.dahe.mylibrary.base.BaseFragment import com.dahe.mylibrary.callback.RefreshCallBack import com.dahe.mylibrary.net.CommonResponseBean diff --git a/app/src/main/res/layout/activity_auth_team_edit.xml b/app/src/main/res/layout/activity_auth_team_edit.xml index 6c52002..18189b7 100644 --- a/app/src/main/res/layout/activity_auth_team_edit.xml +++ b/app/src/main/res/layout/activity_auth_team_edit.xml @@ -435,11 +435,12 @@ + >