denghuan/GLDriver
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

从业资格证号隐藏

Browse Source
This commit is contained in:
lijia 2024-04-16 11:23:52 +08:00
parent 35b9d7c24e
commit 2db602547a
9 changed files with 260 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthQualificationActivity.kt
View File

@ -33,7 +33,7 @@ class AuthQualificationActivity : BaseActivity<ActivityAuthQualificationBinding>
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<ActivityAuthQualificationBinding>
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())

10
app/src/main/java/com/dahe/gldriver/ui/account/authperson/EditBankCardActivity.kt
View File

@ -55,6 +55,14 @@ class EditBankCardActivity : BaseActivity<ActivityAuthBankcardBinding>() {
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<ActivityAuthBankcardBinding>() {
.subscribe(BaseObserver(mContext, object : RxHttpCallBack<Any>() {
override fun onSuccess(t: CommonResponseBean<Any>) {
super.onSuccess(t)
showToast("修改成功")
setResult(RESULT_OK)
finish()
}
}))

6
app/src/main/java/com/dahe/gldriver/ui/account/authperson/EditQualificationActivity.kt
View File

@ -79,7 +79,7 @@ class EditQualificationActivity : BaseActivity<ActivityAuthQualificationBinding>
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<ActivityAuthQualificationBinding>
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
}

52
app/src/main/java/com/dahe/gldriver/ui/mine/activity/PersonInfoActivity.kt
View File

@ -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<ActivityPersonInfoBinding>(), 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<ActivityPersonInfoBinding>(), 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<ActivityPersonInfoBinding>(), 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<ActivityPersonInfoBinding>(), View.OnCli
doneInfoCount++
tvInfo.text = """${data.idcardName} ${data.idcardNo}"""
}
if (data.licenseNo.isNullOrEmpty()) {
tvDriverInfo.text = "证件缺失将无法进行接单"
missInfo =
@ -180,6 +204,7 @@ class PersonInfoActivity : BaseActivity<ActivityPersonInfoBinding>(), View.OnCli
doneInfoCount++
tvDriverInfo.text = """${data.licenseName} ${data.licenseNo}"""
}
if (data.qualificationCertificateNo.isNullOrEmpty()) {
tvQualiInfo.text = "证件缺失将无法进行接单"
missInfo =
@ -192,19 +217,33 @@ class PersonInfoActivity : BaseActivity<ActivityPersonInfoBinding>(), 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<ActivityPersonInfoBinding>(), 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
}
}

29
app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillUnlLoadActivity.kt
View File

@ -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<ActivityWaybillUnloadBinding>() {
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, "请到卸货地再进行卸货操作!")
}
}
}
}

29
app/src/main/java/com/dahe/gldriver/utils/UserUtils.kt
View File

@ -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)
}

3
app/src/main/res/layout/activity_auth_qualification.xml
View File

@ -81,6 +81,7 @@
<LinearLayout
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_26"
@ -112,7 +113,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_76"
android:layout_marginTop="@dimen/dp_18"
android:orientation="horizontal">
<TextView

135
app/src/main/res/layout/activity_person_info.xml
View File

@ -493,6 +493,141 @@
</RelativeLayout>
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_15"
app:cardBackgroundColor="@color/white"
app:cardCornerRadius="@dimen/dp_8">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
android:id="@+id/ivIcon5"
android:layout_width="@dimen/dp_21"
android:layout_height="@dimen/dp_21"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_18"
android:background="@drawable/icon_quali" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/ivIcon5"
android:layout_marginLeft="@dimen/dp_10"
android:layout_toRightOf="@+id/ivIcon5"
android:text="银行卡"
android:textColor="@color/black"
android:textSize="@dimen/sp_16" />
<TextView
android:id="@+id/tvBankInfo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/ivIcon5"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_8"
android:layout_marginBottom="@dimen/dp_15"
tools:text="412************062"
android:textColor="@color/color_c"
android:textSize="@dimen/sp_12" />
<Button
android:id="@+id/btnBank"
android:layout_width="@dimen/dp_55"
android:layout_height="@dimen/dp_22"
android:layout_alignParentRight="true"
android:layout_marginTop="@dimen/dp_24"
android:layout_marginRight="@dimen/dp_14"
android:background="@drawable/shape_btn_11"
android:text="去上传"
android:textColor="@color/white"
android:textSize="@dimen/sp_12" />
<LinearLayout
android:id="@+id/llBank"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/tvBankInfo"
android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15"
android:background="@color/color_c" />
<LinearLayout
android:id="@+id/llAgainBank"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_46"
android:gravity="center"
android:orientation="horizontal">
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:orientation="horizontal">
<ImageView
android:layout_width="@dimen/dp_14"
android:layout_height="@dimen/dp_14"
android:background="@drawable/icon_refre" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_4"
android:text="重新上传"
android:textColor="#917349"
android:textSize="@dimen/sp_12" />
</LinearLayout>
<View
android:layout_width="@dimen/dp_1"
android:layout_height="@dimen/dp_16"
android:background="@color/color_c" />
<LinearLayout
android:id="@+id/llSeeBank"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:orientation="horizontal">
<ImageView
android:layout_width="@dimen/dp_14"
android:layout_height="@dimen/dp_14"
android:background="@drawable/icon_check" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_4"
android:text="查看证件"
android:textColor="#917349"
android:textSize="@dimen/sp_12" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</RelativeLayout>
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"

17
mylibrary/src/main/java/com/dahe/mylibrary/utils/TimeUtil.java
View File

@ -1736,4 +1736,21 @@ public final class TimeUtil {
return false;
}
}
/**
* 得到二个日期间的间隔天数
*
* @return 间格的天数（null表示时间格式不正确）
*/
public static int compareNowDate(long comTime) {
int min;
try {
min = (int) ((getNowMills() - comTime) / (60 * 1000));
} catch (Exception e) {
e.printStackTrace();
return 0;
}
return min;
}
}