From c9b561537f48dcb0f90827b10cba1c48be1bd45a Mon Sep 17 00:00:00 2001 From: lijia Date: Mon, 30 Dec 2024 16:55:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=8E=E4=B8=9A=E8=B5=84?= =?UTF-8?q?=E6=A0=BC=E8=AF=81=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../account/authperson/AuthDriverActivity.kt | 14 +++++----- .../account/authperson/EditDriverActivity.kt | 1 - .../ui/home/HomeFragment.kt | 2 +- .../ui/mine/MineFragment.kt | 26 +++++++++---------- .../ui/mine/activity/PersonInfoActivity.kt | 8 +++--- app/src/main/res/layout/fragment_home.xml | 2 +- 6 files changed, 26 insertions(+), 27 deletions(-) diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthDriverActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthDriverActivity.kt index 3c024c2..306acff 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthDriverActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthDriverActivity.kt @@ -122,18 +122,18 @@ class AuthDriverActivity : BaseActivity() { .subscribe(BaseObserver(mContext, object : RxHttpCallBack() { override fun onSuccess(t: CommonResponseBean) { super.onSuccess(t) - if (driverInfoBean.licenseType.contains("C")) {//C证 - ActivityUtils.startActivity( - mContext, - AuthBankCardActivity::class.java - ) - } else { + //驾驶证类型包含A B类需要上传从业资格证 + if (driverInfoBean.licenseType.contains("A")||driverInfoBean.licenseType.contains("B")) { ActivityUtils.startActivity( mContext, AuthQualificationActivity::class.java ) + }else{ + ActivityUtils.startActivity( + mContext, + AuthBankCardActivity::class.java + ) } - } })) } diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditDriverActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditDriverActivity.kt index 8d939ee..2f64b8e 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditDriverActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditDriverActivity.kt @@ -70,7 +70,6 @@ class EditDriverActivity : BaseActivity() { } ivFront.setOnClickListener { - if (driverInfoBean.licensePhotoFaceUrl.isNullOrEmpty()){ selFrontPic() }else{ diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.kt index abc2771..8c3edf9 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.kt @@ -206,7 +206,7 @@ class HomeFragment : BaseFragment(), RefreshCallBack { ) - getLocation() +// getLocation() ALProcess.verification(mContext) //证件过期判断+轨迹上传判断 DataManager.getInstance().getUserInfo() diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/MineFragment.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/MineFragment.kt index 931f5d8..12606a0 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/MineFragment.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/MineFragment.kt @@ -323,19 +323,19 @@ class MineFragment : BaseFragment(), View.OnClickListener, } })) - DataManager.getInstance().getDriverBalance() - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(BaseObserver(mContext, object : RxHttpCallBack() { - override fun onSuccess(t: CommonResponseBean) { - super.onSuccess(t) - binding.run { - tvWalletBa.text = t.data.acctBal - tvBankNum.text = t.data.bankCountNum - tvIncome.text = t.data.accumulatedRevenue - } - } - })) +// DataManager.getInstance().getDriverBalance() +// .subscribeOn(Schedulers.io()) +// .observeOn(AndroidSchedulers.mainThread()) +// .subscribe(BaseObserver(mContext, object : RxHttpCallBack() { +// override fun onSuccess(t: CommonResponseBean) { +// super.onSuccess(t) +// binding.run { +// tvWalletBa.text = t.data.acctBal +// tvBankNum.text = t.data.bankCountNum +// tvIncome.text = t.data.accumulatedRevenue +// } +// } +// })) //司机证件缺失过期提醒 val userInfo = SPUtils.instance.getUserInfo(mContext) diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/activity/PersonInfoActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/activity/PersonInfoActivity.kt index d98a7fc..97d66ab 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/activity/PersonInfoActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/activity/PersonInfoActivity.kt @@ -222,7 +222,7 @@ class PersonInfoActivity : BaseActivity(), View.OnCli tvDriverInfo.text = """${data.licenseName} ${data.licenseNo}""" } - if (data.licenseType.contains("C")) { + if (!data.licenseType.contains("A")&&!data.licenseType.contains("B")) { cvQua.visibility = View.GONE allInfoCount = 4 } else { @@ -239,7 +239,7 @@ class PersonInfoActivity : BaseActivity(), View.OnCli } } else { doneInfoCount++ - tvQualiInfo.text = """${data.qualificationCertificateNo}""" + tvQualiInfo.text = data.qualificationCertificateNo } } @@ -253,7 +253,7 @@ class PersonInfoActivity : BaseActivity(), View.OnCli } } else { doneInfoCount++ - tvBankInfo.text = """${data.driverBankcardNumber}""" + tvBankInfo.text = data.driverBankcardNumber } @@ -294,7 +294,7 @@ class PersonInfoActivity : BaseActivity(), View.OnCli if (data.driverBankcardNumber.isNullOrEmpty()) View.VISIBLE else View.GONE - btnFace.visibility = if (data?.isRealName == "0") View.VISIBLE else View.GONE + btnFace.visibility = if (data.isRealName == "0") View.VISIBLE else View.GONE circleBarView2.progress = doneInfoCount * 100 / allInfoCount } diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 13ccafc..8284058 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -88,7 +88,7 @@ android:layout_height="wrap_content" android:text="郑州" android:textColor="@color/white" - android:textSize="@dimen/sp_16"> + android:textSize="@dimen/sp_16" />