From 2db602547ad5426362ffff0ffebd6159b64acbf1 Mon Sep 17 00:00:00 2001 From: lijia Date: Tue, 16 Apr 2024 11:23:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=8E=E4=B8=9A=E8=B5=84=E6=A0=BC=E8=AF=81?= =?UTF-8?q?=E5=8F=B7=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../authperson/AuthQualificationActivity.kt | 8 +- .../authperson/EditBankCardActivity.kt | 10 ++ .../authperson/EditQualificationActivity.kt | 6 +- .../ui/mine/activity/PersonInfoActivity.kt | 52 ++++++- .../activity/WaybillUnlLoadActivity.kt | 29 ++-- .../java/com/dahe/gldriver/utils/UserUtils.kt | 29 ++-- .../layout/activity_auth_qualification.xml | 3 +- .../main/res/layout/activity_person_info.xml | 135 ++++++++++++++++++ .../com/dahe/mylibrary/utils/TimeUtil.java | 17 +++ 9 files changed, 260 insertions(+), 29 deletions(-) diff --git a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthQualificationActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthQualificationActivity.kt index e70f7ea..b876d8a 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthQualificationActivity.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthQualificationActivity.kt @@ -33,7 +33,7 @@ class AuthQualificationActivity : BaseActivity setTitleBar("实名认证", true) binding.run { - etId.setText(SPUtils.instance.getUserInfo(mContext).idcard) +// etId.setText(SPUtils.instance.getUserInfo(mContext).idcard) btnOk.setOnClickListener { subMit() } @@ -72,9 +72,13 @@ class AuthQualificationActivity : BaseActivity private fun subMit() { upQuaInfo.run { - qualificationCertificateNo = binding.etId.text.toString() +// qualificationCertificateNo = binding.etId.text.toString() qualificationCertificateEffectiveEnd = binding.tvDate.text.toString() + if (qualificationCertificateEffectiveEnd.isNullOrEmpty()||upQuaInfo.qualificationCertificatePhotoUrl.isNullOrEmpty()) { + showToast("请完善信息") + return@run + } DataManager.getInstance().setUpDriverQualificationCertificate(upQuaInfo) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/EditBankCardActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/EditBankCardActivity.kt index a2e86c3..84c00f1 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/EditBankCardActivity.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/EditBankCardActivity.kt @@ -55,6 +55,14 @@ class EditBankCardActivity : BaseActivity() { super.onSuccess(t) perInfoBean = t.data binding.run { + var isOnlyShow = + intent.extras?.getBoolean(AppConfig.IS_ONLY_SHOW, false) == true + if (isOnlyShow) { + tvBankName.isEnabled = false + etId.isEnabled = false + ivFront.isEnabled = false + } + etId.setText(perInfoBean.driverBankcardNumber) tvBankName.setText(perInfoBean.driverBankcardAddress) ImageLoader.getInstance() @@ -118,6 +126,8 @@ class EditBankCardActivity : BaseActivity() { .subscribe(BaseObserver(mContext, object : RxHttpCallBack() { override fun onSuccess(t: CommonResponseBean) { super.onSuccess(t) + showToast("修改成功") + setResult(RESULT_OK) finish() } })) diff --git a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/EditQualificationActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/EditQualificationActivity.kt index 8deb3fc..0ddb9aa 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/EditQualificationActivity.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/EditQualificationActivity.kt @@ -79,7 +79,7 @@ class EditQualificationActivity : BaseActivity ivFront.isEnabled = false } tvDate.text = upQuaInfo.qualificationCertificateEffectiveEnd - etId.setText(if (upQuaInfo.qualificationCertificateNo.isNullOrEmpty()) SPUtils.instance.getUserInfo(mContext).idcard else upQuaInfo.qualificationCertificateNo) +// etId.setText(if (upQuaInfo.qualificationCertificateNo.isNullOrEmpty()) SPUtils.instance.getUserInfo(mContext).idcard else upQuaInfo.qualificationCertificateNo) ImageLoader.getInstance() .loadRoundImage( @@ -96,11 +96,11 @@ class EditQualificationActivity : BaseActivity private fun subMit() { upQuaInfo.run { - qualificationCertificateNo = binding.etId.text.toString() +// qualificationCertificateNo = binding.etId.text.toString() qualificationCertificateEffectiveEnd = binding.tvDate.text.toString() - if (qualificationCertificateNo.isNullOrEmpty() || qualificationCertificateEffectiveEnd.isNullOrEmpty()) { + if (qualificationCertificateEffectiveEnd.isNullOrEmpty()) { showToast("请完善信息") return@run } diff --git a/app/src/main/java/com/dahe/gldriver/ui/mine/activity/PersonInfoActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/mine/activity/PersonInfoActivity.kt index 048006f..ba955cc 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/mine/activity/PersonInfoActivity.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/mine/activity/PersonInfoActivity.kt @@ -13,6 +13,7 @@ import com.dahe.gldriver.ui.account.authperson.AuthDriverActivity import com.dahe.gldriver.ui.account.authperson.AuthFaceActivity import com.dahe.gldriver.ui.account.authperson.AuthPersonActivity import com.dahe.gldriver.ui.account.authperson.AuthQualificationActivity +import com.dahe.gldriver.ui.account.authperson.EditBankCardActivity import com.dahe.gldriver.ui.account.authperson.EditDriverActivity import com.dahe.gldriver.ui.account.authperson.EditPersonActivity import com.dahe.gldriver.ui.account.authperson.EditQualificationActivity @@ -58,6 +59,10 @@ class PersonInfoActivity : BaseActivity(), View.OnCli llAgainQua.setOnClickListener(this@PersonInfoActivity) llSeeQua.setOnClickListener(this@PersonInfoActivity) + btnBank.setOnClickListener(this@PersonInfoActivity) + llAgainBank.setOnClickListener(this@PersonInfoActivity) + llSeeBank.setOnClickListener(this@PersonInfoActivity) + btnFace.setOnClickListener(this@PersonInfoActivity) btnNext.setOnClickListener(this@PersonInfoActivity) @@ -117,6 +122,19 @@ class PersonInfoActivity : BaseActivity(), View.OnCli putBoolean(AppConfig.IS_ONLY_SHOW, true) }) + + btnBank.id, llAgainBank.id -> ActivityUtils.startActivityForResult( + this@PersonInfoActivity, + EditBankCardActivity::class.java, 1 + ) + + llSeeBank.id -> ActivityUtils.startActivity( + mContext, + EditBankCardActivity::class.java, + Bundle().apply { + putBoolean(AppConfig.IS_ONLY_SHOW, true) + }) + btnFace.id -> { ActivityUtils.startActivity( mContext, @@ -143,6 +161,11 @@ class PersonInfoActivity : BaseActivity(), View.OnCli ) 4 -> ActivityUtils.startActivityForResult( + this@PersonInfoActivity, + EditBankCardActivity::class.java, 1 + ) + + 5 -> ActivityUtils.startActivityForResult( this@PersonInfoActivity, AuthFaceActivity::class.java, Bundle().apply { putBoolean(AppConfig.IS_SUPPLEMENT, true) }, 1 @@ -169,6 +192,7 @@ class PersonInfoActivity : BaseActivity(), View.OnCli doneInfoCount++ tvInfo.text = """${data.idcardName} ${data.idcardNo}""" } + if (data.licenseNo.isNullOrEmpty()) { tvDriverInfo.text = "证件缺失将无法进行接单" missInfo = @@ -180,6 +204,7 @@ class PersonInfoActivity : BaseActivity(), View.OnCli doneInfoCount++ tvDriverInfo.text = """${data.licenseName} ${data.licenseNo}""" } + if (data.qualificationCertificateNo.isNullOrEmpty()) { tvQualiInfo.text = "证件缺失将无法进行接单" missInfo = @@ -192,19 +217,33 @@ class PersonInfoActivity : BaseActivity(), View.OnCli tvQualiInfo.text = """${data.qualificationCertificateNo}""" } + if (data.driverBankcardNumber.isNullOrEmpty()) { + tvBankInfo.text = "证件缺失将无法进行接单" + missInfo = + if (missInfo.isNullOrEmpty()) missInfo.plus("银行卡") else missInfo.plus("、银行卡") + if (firstMissingInfo == -1) { + firstMissingInfo = 4 + } + } else { + doneInfoCount++ + tvBankInfo.text = """${data.driverBankcardNumber}""" + } + + + if (data?.isRealName == "0") { tvFaceInfo.text = "未实名认证将无法进行接单" missInfo = if (missInfo.isNullOrEmpty()) missInfo.plus("实名认证") else missInfo.plus("、实名认证") if (firstMissingInfo == -1) { - firstMissingInfo = 4 + firstMissingInfo = 5 } } else { doneInfoCount++ tvFaceInfo.text = "实名认证成功" } - btnNext.text = if (doneInfoCount == 4) "已完成" else "继续认证" + btnNext.text = if (doneInfoCount == 5) "已完成" else "继续认证" tvContent.text = if (missInfo.isNullOrEmpty()) "认证成功,请接单把!!!" else missInfo.plus("缺失") @@ -218,9 +257,16 @@ class PersonInfoActivity : BaseActivity(), View.OnCli if (data.qualificationCertificateNo.isNullOrEmpty()) View.GONE else View.VISIBLE btnQua.visibility = if (data.qualificationCertificateNo.isNullOrEmpty()) View.VISIBLE else View.GONE + + llBank.visibility = + if (data.driverBankcardNumber.isNullOrEmpty()) View.GONE else View.VISIBLE + btnBank.visibility = + if (data.driverBankcardNumber.isNullOrEmpty()) View.VISIBLE else View.GONE + + btnFace.visibility = if (data?.isRealName == "0") View.VISIBLE else View.GONE - circleBarView2.progress = doneInfoCount * 100 / 4 + circleBarView2.progress = doneInfoCount * 100 / 5 } } diff --git a/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillUnlLoadActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillUnlLoadActivity.kt index 0de68f6..491aa04 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillUnlLoadActivity.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillUnlLoadActivity.kt @@ -1,6 +1,7 @@ package com.dahe.gldriver.ui.waybill.activity import android.Manifest +import android.content.Intent import android.graphics.Color import android.os.Bundle import android.widget.LinearLayout @@ -28,6 +29,7 @@ import com.dahe.mylibrary.utils.ActivityUtils import com.dahe.mylibrary.utils.BaseUtils import com.dahe.mylibrary.utils.ConvertUtils import com.dahe.mylibrary.utils.LoadingUtils +import com.dahe.mylibrary.utils.TimeUtil import com.dahe.mylibrary.utils.ToastUtils import com.permissionx.guolindev.PermissionX import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers @@ -85,14 +87,25 @@ class WaybillUnlLoadActivity : BaseActivity() { btnRight.setOnClickListener { - ActivityUtils.startActivity( - mContext, - WaybillUpPicActivity::class.java, - Bundle().apply { - putInt(AppConfig.SUCCESS_TYPE, 2) - putString(AppConfig.ORDER_ID, orderId) - putString(AppConfig.WAYBILL_ID, orderBean.waybillId) - }) + if (!::orderBean.isInitialized){ + ToastUtils.showToast(mContext,"请等待数据加载完成") + return@setOnClickListener + } + var dis = TimeUtil.compareNowDate(TimeUtil.string2Millis(orderBean.waybillInfo.loadTime)) + if (dis > 5) { //大于五分钟可以接单 + ActivityUtils.startActivity( + mContext, + WaybillUpPicActivity::class.java, + Bundle().apply { + putInt(AppConfig.SUCCESS_TYPE, 2) + putString(AppConfig.ORDER_ID, orderId) + putString(AppConfig.WAYBILL_ID, orderBean.waybillId) + }) + } else { + ToastUtils.showToast(this@WaybillUnlLoadActivity, "请到卸货地再进行卸货操作!") + } + + } } } 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 8ec7914..461aeb2 100644 --- a/app/src/main/java/com/dahe/gldriver/utils/UserUtils.kt +++ b/app/src/main/java/com/dahe/gldriver/utils/UserUtils.kt @@ -40,18 +40,23 @@ class UserUtils private constructor(){ //设置推送别名 PushHelper.setAlias(context,userBean) - 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) + 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_qualification.xml b/app/src/main/res/layout/activity_auth_qualification.xml index f01964e..a1ff96e 100644 --- a/app/src/main/res/layout/activity_auth_qualification.xml +++ b/app/src/main/res/layout/activity_auth_qualification.xml @@ -81,6 +81,7 @@ + + + + + + + + + + + + +