From d40d2783c920c725ca83f52b46a7370d330e3d82 Mon Sep 17 00:00:00 2001 From: lijia Date: Fri, 12 Apr 2024 14:37:33 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E9=80=89=E6=8B=A9=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dahe/gldriver/bean/UpInfoBean.kt | 2 + .../ui/account/authteam/AuthTeamActivity.kt | 203 ++++++++++++++---- .../com/dahe/gldriver/ui/mine/MineFragment.kt | 6 +- .../java/com/dahe/gldriver/utils/UserUtils.kt | 28 ++- .../main/res/layout/activity_auth_team.xml | 3 +- 5 files changed, 193 insertions(+), 49 deletions(-) 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 f66aa40..b50c619 100644 --- a/app/src/main/java/com/dahe/gldriver/bean/UpInfoBean.kt +++ b/app/src/main/java/com/dahe/gldriver/bean/UpInfoBean.kt @@ -127,6 +127,7 @@ data class UpBankInfoBean( data class AuthTeamBean( var captainBankcardAddress: String="", var captainBankcardNumber: String="", + var captainBankcardName: String="", var captainBankcardPhotoUrl: String="", var captainType: String="",//类型(0=个人，1=企业) var idcardAddress: String="", @@ -140,6 +141,7 @@ data class AuthTeamBean( var idcardNo: String="", var roadLicensePhotoUrl: String="", var roadLicense: String="", + var roadLicenseValidity: String="", var roadLicensevaridity: String="", var businessLicensePhoneUrl: String="", var businessLicenseCreditCode: String="", 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 344f336..dde5265 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 @@ -10,13 +10,16 @@ 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.HomeActivity import com.dahe.gldriver.utils.OcrUtils import com.dahe.mylibrary.base.BaseActivity 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 import io.reactivex.rxjava3.schedulers.Schedulers @@ -49,8 +52,10 @@ class AuthTeamActivity : BaseActivity(), View.OnClickLi result?.data?.run { upComInfoBean.businessLicenseCreditCode = creditCode - upComInfoBean.businessLicenseEffectiveStart= TimeUtil.changeDateNoneFormat(validFromDate) - upComInfoBean.businessLicenseEffectiveEnd=TimeUtil.changeDateNoneFormat(validToDate) + upComInfoBean.businessLicenseEffectiveStart = + TimeUtil.changeDateNoneFormat(validFromDate) + upComInfoBean.businessLicenseEffectiveEnd = + TimeUtil.changeDateNoneFormat(validToDate) } ImageLoader.getInstance() .loadRoundImage(mContext, picPath.locPic, 12, ivBusiness) @@ -61,6 +66,10 @@ class AuthTeamActivity : BaseActivity(), View.OnClickLi ivComFront.setOnClickListener { OcrUtils.getInstance() .ocrPerson(mContext, this@AuthTeamActivity) { picPath, result -> + if (result?.data?.face == null) { + ToastUtils.showToast(mContext, "请选择正确证件照片") + return@ocrPerson + } ImageLoader.getInstance() .loadRoundImage(mContext, picPath.locPic, 12, ivComFront) result?.data?.face?.data?.run { @@ -81,17 +90,31 @@ class AuthTeamActivity : BaseActivity(), View.OnClickLi ivComBack.setOnClickListener { OcrUtils.getInstance() .ocrPerson(mContext, this@AuthTeamActivity) { picPath, result -> + if (result?.data?.back == null) { + ToastUtils.showToast(mContext, "请选择正确证件照片") + return@ocrPerson + } + ImageLoader.getInstance() .loadRoundImage(mContext, picPath.locPic, 12, ivComBack) result?.data?.back?.data?.run { + upComInfoBean.run { +// idcardEffectiveStart = TimeUtil.changeDateFormat(split[0]) +// idcardEffectiveEnd = if (split.size == 2) TimeUtil.changeDateFormat(split[1]) else "" + idcardBackUrl = picPath.picPath + } if (validPeriod.contains("-")) { val split = validPeriod.split("-") tvStart.text = TimeUtil.changeDateFormat(split[0]) - tvEnd.text = if (split.size == 2) TimeUtil.changeDateFormat(split[1]) else "" - upComInfoBean.run { -// idcardEffectiveStart = TimeUtil.changeDateFormat(split[0]) -// idcardEffectiveEnd = if (split.size == 2) TimeUtil.changeDateFormat(split[1]) else "" - idcardBackUrl = picPath.picPath + tvEnd.text = + if (split.size == 2) TimeUtil.changeDateFormat(split[1]) else "" + } + if (validPeriod?.contains("长期") == true) { + val split = validPeriod.split("长期") + binding.run { + tvStart.text = + TimeUtil.changeDateFormat(split[0]) + tvEnd.text = "长期" } } } @@ -101,6 +124,11 @@ class AuthTeamActivity : BaseActivity(), View.OnClickLi ivFront.setOnClickListener { OcrUtils.getInstance() .ocrPerson(mContext, this@AuthTeamActivity) { picPath, result -> + if (result?.data?.face == null) { + ToastUtils.showToast(mContext, "请选择正确证件照片") + return@ocrPerson + } + ImageLoader.getInstance() .loadRoundImage(mContext, picPath.locPic, 12, ivFront) result?.data?.face?.data?.run { @@ -123,18 +151,30 @@ class AuthTeamActivity : BaseActivity(), View.OnClickLi ivBack.setOnClickListener { OcrUtils.getInstance() .ocrPerson(mContext, this@AuthTeamActivity) { picPath, result -> + if (result?.data?.back == null) { + ToastUtils.showToast(mContext, "请选择正确证件照片") + return@ocrPerson + } + ImageLoader.getInstance() .loadRoundImage(mContext, picPath.locPic, 12, ivBack) result?.data?.back?.data?.run { + upPerInfoBean.run { + idcardBackUrl = picPath.picPath + } if (validPeriod.contains("-")) { val split = validPeriod.split("-") tvPerStart.text = TimeUtil.changeDateFormat(split[0]) - tvPerEnd.text = if (split.size == 2) TimeUtil.changeDateFormat(split[1]) else "" + tvPerEnd.text = + if (split.size == 2) TimeUtil.changeDateFormat(split[1]) else "" + } - upPerInfoBean.run { - idcardEffectiveStart = tvPerStart.text.toString() - idcardEffectiveEnd = tvPerEnd.text.toString() - idcardBackUrl = picPath.picPath + if (validPeriod?.contains("长期") == true) { + val split = validPeriod.split("长期") + binding.run { + tvPerStart.text = + TimeUtil.changeDateFormat(split[0]) + tvPerEnd.text = "长期" } } } @@ -161,10 +201,12 @@ class AuthTeamActivity : BaseActivity(), View.OnClickLi } //道路运输许可证 ivRoad.setOnClickListener { - PopsUtils.getInstance().showSimSelPic(mContext) { -// upComInfoBean.roadLicensePhotoUrl = it[0].realPath - ImageLoader.getInstance().loadRoundImage(mContext, it[0].realPath, 12, ivRoad) - } + OcrUtils.getInstance() + .noOcrUpPic(mContext, this@AuthTeamActivity) { picPath, ocrResult -> + ImageLoader.getInstance() + .loadRoundImage(mContext, picPath.locPic, 12, ivRoad) + upComInfoBean.roadLicensePhotoUrl = picPath.picPath + } } //公司银行卡 @@ -180,6 +222,7 @@ class AuthTeamActivity : BaseActivity(), View.OnClickLi } upComInfoBean.run { captainBankcardNumber = cardNumber + captainBankcardName = bankName captainBankcardPhotoUrl = picPath.picPath } } @@ -188,19 +231,45 @@ class AuthTeamActivity : BaseActivity(), View.OnClickLi tvComDate.setOnClickListener { PickerUtils.getInstance() - .showDate(this@AuthTeamActivity, "请选择有效期至") { date-> + .showDateSim(this@AuthTeamActivity, "请选择有效期至") { date -> tvComDate.text = date } } tvPerStart.setOnClickListener { PickerUtils.getInstance() - .showDate(this@AuthTeamActivity, "请选择有效期至") { date -> + .showDate(this@AuthTeamActivity, "请选择起始日期") { date -> tvPerStart.text = date } } + tvPerEnd.setOnClickListener { + PickerUtils.getInstance() + .showDateSim(this@AuthTeamActivity, "请选择有效期至") { date -> + tvPerEnd.text = date + } + } + btnOk.setOnClickListener(this@AuthTeamActivity) + + /** + * 运输公司身份证开始日期 + */ + tvStart.setOnClickListener { + PickerUtils.getInstance() + .showDate(this@AuthTeamActivity, "请选择起始日期") { date -> + tvStart.text = date + } + } + + /** + * 运输公司身份证截止日期 + */ + tvEnd.setOnClickListener { + PickerUtils.getInstance().showDateSim(this@AuthTeamActivity, "请选择有效期至") { + tvEnd.text = it + } + } } } @@ -222,31 +291,93 @@ class AuthTeamActivity : BaseActivity(), View.OnClickLi super.onClick(view) when (view?.id) { binding.btnOk.id -> { - DataManager.getInstance() - .authenticationCaptain(if (checkTeamType == 1) upComInfoBean else upPerInfoBean) - .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()) - .subscribe(BaseObserver(mContext, object : RxHttpCallBack(this) { - override fun onSuccess(t: CommonResponseBean) { - super.onSuccess(t) - } - })) + subMit() } - binding.ivBusiness.id -> {} - binding.ivComFront.id -> {} - binding.ivComBack.id -> {} - binding.ivComBank.id -> {} - binding.tvComDate.id -> {} - binding.tvPerStart.id -> {} - binding.ivFront.id -> {} - binding.ivBack.id -> {} - binding.ivBank.id -> {} - binding.ivRoad.id -> {} +// binding.ivBusiness.id -> {} +// binding.ivComFront.id -> {} +// binding.ivComBack.id -> {} +// binding.ivComBank.id -> {} +// binding.tvComDate.id -> {} +// binding.tvPerStart.id -> {} +// binding.ivFront.id -> {} +// binding.ivBack.id -> {} +// binding.ivBank.id -> {} +// binding.ivRoad.id -> {} } } private fun subMit() { + binding.run { + if (checkTeamType == 1) {//运输公司 + //道路运输相关 + upComInfoBean.roadLicense = etRootId.text.toString().trim() + upComInfoBean.roadLicenseValidity = tvComDate.text.toString().trim() + //银行卡相关信息 + upComInfoBean.captainBankcardNumber = etComBankId.text.toString().trim() + upComInfoBean.captainBankcardName = etComBankName.text.toString().trim() + //身份证相关信息 + upComInfoBean.idcardName = etName.text.toString().trim() + upComInfoBean.idcardNo = etId.text.toString().trim() + upComInfoBean.idcardEffectiveStart = tvStart.text.toString().trim() + if ("长期" == tvEnd.text.toString().trim()) { + upComInfoBean.idcardIsEndless = "1" + } else { + upComInfoBean.idcardEffectiveEnd = tvEnd.text.toString().trim() + } + + if (upComInfoBean.roadLicense.isNullOrEmpty() || upComInfoBean.roadLicenseValidity.isNullOrEmpty() || + upComInfoBean.businessLicensePhoneUrl.isNullOrEmpty() || upComInfoBean.roadLicensePhotoUrl.isNullOrEmpty() || + upComInfoBean.captainBankcardPhotoUrl.isNullOrEmpty() || upComInfoBean.idcardFrontUrl.isNullOrEmpty() || + upComInfoBean.idcardBackUrl.isNullOrEmpty() || + upComInfoBean.captainBankcardNumber.isNullOrEmpty() || upComInfoBean.captainBankcardName.isNullOrEmpty() || + upComInfoBean.idcardName.isNullOrEmpty() || upComInfoBean.idcardNo.isNullOrEmpty() || + upComInfoBean.idcardEffectiveStart.isNullOrEmpty() + ) { + ToastUtils.showToast(mContext, "请完善信息") + return@run + } + + } else { + //身份证相关信息 + upPerInfoBean.idcardNo = etPerId.text.toString().trim() + upPerInfoBean.idcardName = etPerName.text.toString().trim() + upPerInfoBean.idcardEffectiveStart = tvPerStart.text.toString().trim() + if ("长期" == tvPerEnd.text.toString().trim()) { + upPerInfoBean.idcardIsEndless = "1" + } else { + upPerInfoBean.idcardEffectiveEnd = tvEnd.text.toString().trim() + } + //银行卡相关信息 + upPerInfoBean.captainBankcardNumber = etPerBankId.text.toString().trim() + upPerInfoBean.captainBankcardName = tvPerBankName.text.toString().trim() + + + if (upPerInfoBean.idcardNo.isNullOrEmpty() || upPerInfoBean.idcardName.isNullOrEmpty() || + upPerInfoBean.idcardEffectiveStart.isNullOrEmpty() || upPerInfoBean.captainBankcardPhotoUrl.isNullOrEmpty() || + upPerInfoBean.idcardFrontUrl.isNullOrEmpty() || upPerInfoBean.idcardBackUrl.isNullOrEmpty() || + upPerInfoBean.captainBankcardNumber.isNullOrEmpty() || upPerInfoBean.captainBankcardName.isNullOrEmpty() + ) { + ToastUtils.showToast(mContext, "请完善信息") + return@run + } + } + + DataManager.getInstance() + .authenticationCaptain(if (checkTeamType == 1) upComInfoBean else upPerInfoBean) + .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()) + .subscribe( + BaseObserver( + mContext, + object : RxHttpCallBack(this@AuthTeamActivity) { + override fun onSuccess(t: CommonResponseBean) { + super.onSuccess(t) + ActivityUtils.startActivity(mContext, HomeActivity::class.java) + } + }) + ) + } } 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 378ab4a..9bd1866 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 @@ -66,7 +66,7 @@ class MineFragment : BaseFragment(), View.OnClickListener, override fun onFragmentFirstVisible() { setRefresh(binding.refresh, this) - refreshView() + getUserData() binding.run { //初始化常用工具 @@ -183,6 +183,10 @@ class MineFragment : BaseFragment(), View.OnClickListener, } override fun getRefreshDate(stat: Int, page: Int, count: Int) { + getUserData() + } + + private fun getUserData(){ DataManager.getInstance().getUserInfo() .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/dahe/gldriver/utils/UserUtils.kt b/app/src/main/java/com/dahe/gldriver/utils/UserUtils.kt index 0508eb8..0fd79c2 100644 --- a/app/src/main/java/com/dahe/gldriver/utils/UserUtils.kt +++ b/app/src/main/java/com/dahe/gldriver/utils/UserUtils.kt @@ -39,17 +39,23 @@ class UserUtils private constructor(){ SPUtils.instance.setUserInfo(context, Gson().toJson(userBean)) //设置推送别名 PushHelper.setAlias(context,userBean) - if (userBean.isCarCaptain == "9") {//是否是车队长（0=否,1=是,9=未选择） - ActivityUtils.startActivity( - context, - SelectRoleActivity::class.java - ) - } else { - ActivityUtils.startActivity( - context, - HomeActivity::class.java - ) - } + + // TODO: 临时注释替换 + ActivityUtils.startActivity( + context, + SelectRoleActivity::class.java + ) +// if (userBean.isCarCaptain == "9") {//是否是车队长（0=否,1=是,9=未选择） +// ActivityUtils.startActivity( +// context, +// SelectRoleActivity::class.java +// ) +// } else { +// ActivityUtils.startActivity( +// context, +// HomeActivity::class.java +// ) +// } ActivityUtils.finishToActivity(LoginActivity::class.java,true) } diff --git a/app/src/main/res/layout/activity_auth_team.xml b/app/src/main/res/layout/activity_auth_team.xml index 11fd0e3..4736124 100644 --- a/app/src/main/res/layout/activity_auth_team.xml +++ b/app/src/main/res/layout/activity_auth_team.xml @@ -169,11 +169,12 @@