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-12 14:37:33 +08:00
parent 0a472b0f74
commit d40d2783c9
5 changed files with 193 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/dahe/gldriver/bean/UpInfoBean.kt
View File

@ -127,6 +127,7 @@ data class UpBankInfoBean(
data class AuthTeamBean( data class AuthTeamBean(
var captainBankcardAddress: String="", var captainBankcardAddress: String="",
var captainBankcardNumber: String="", var captainBankcardNumber: String="",
var captainBankcardName: String="",
var captainBankcardPhotoUrl: String="", var captainBankcardPhotoUrl: String="",
var captainType: String="",//类型(0=个人，1=企业) var captainType: String="",//类型(0=个人，1=企业)
var idcardAddress: String="", var idcardAddress: String="",
@ -140,6 +141,7 @@ data class AuthTeamBean(
var idcardNo: String="", var idcardNo: String="",
var roadLicensePhotoUrl: String="", var roadLicensePhotoUrl: String="",
var roadLicense: String="", var roadLicense: String="",
var roadLicenseValidity: String="",
var roadLicensevaridity: String="", var roadLicensevaridity: String="",
var businessLicensePhoneUrl: String="", var businessLicensePhoneUrl: String="",
var businessLicenseCreditCode: String="", var businessLicenseCreditCode: String="",

203
app/src/main/java/com/dahe/gldriver/ui/account/authteam/AuthTeamActivity.kt
View File

@ -10,13 +10,16 @@ import com.dahe.gldriver.net.BaseObserver
import com.dahe.gldriver.net.DataManager import com.dahe.gldriver.net.DataManager
import com.dahe.gldriver.net.RxHttpCallBack import com.dahe.gldriver.net.RxHttpCallBack
import com.dahe.gldriver.oss.OssServiceUtil import com.dahe.gldriver.oss.OssServiceUtil
import com.dahe.gldriver.ui.HomeActivity
import com.dahe.gldriver.utils.OcrUtils import com.dahe.gldriver.utils.OcrUtils
import com.dahe.mylibrary.base.BaseActivity import com.dahe.mylibrary.base.BaseActivity
import com.dahe.mylibrary.net.CommonResponseBean import com.dahe.mylibrary.net.CommonResponseBean
import com.dahe.mylibrary.utils.ActivityUtils
import com.dahe.mylibrary.utils.ImageLoader import com.dahe.mylibrary.utils.ImageLoader
import com.dahe.mylibrary.utils.PickerUtils import com.dahe.mylibrary.utils.PickerUtils
import com.dahe.mylibrary.utils.PopsUtils import com.dahe.mylibrary.utils.PopsUtils
import com.dahe.mylibrary.utils.TimeUtil import com.dahe.mylibrary.utils.TimeUtil
import com.dahe.mylibrary.utils.ToastUtils
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
import io.reactivex.rxjava3.schedulers.Schedulers import io.reactivex.rxjava3.schedulers.Schedulers
@ -49,8 +52,10 @@ class AuthTeamActivity : BaseActivity<ActivityAuthTeamBinding>(), View.OnClickLi
result?.data?.run { result?.data?.run {
upComInfoBean.businessLicenseCreditCode = creditCode upComInfoBean.businessLicenseCreditCode = creditCode
upComInfoBean.businessLicenseEffectiveStart= TimeUtil.changeDateNoneFormat(validFromDate) upComInfoBean.businessLicenseEffectiveStart =
upComInfoBean.businessLicenseEffectiveEnd=TimeUtil.changeDateNoneFormat(validToDate) TimeUtil.changeDateNoneFormat(validFromDate)
upComInfoBean.businessLicenseEffectiveEnd =
TimeUtil.changeDateNoneFormat(validToDate)
} }
ImageLoader.getInstance() ImageLoader.getInstance()
.loadRoundImage(mContext, picPath.locPic, 12, ivBusiness) .loadRoundImage(mContext, picPath.locPic, 12, ivBusiness)
@ -61,6 +66,10 @@ class AuthTeamActivity : BaseActivity<ActivityAuthTeamBinding>(), View.OnClickLi
ivComFront.setOnClickListener { ivComFront.setOnClickListener {
OcrUtils.getInstance() OcrUtils.getInstance()
.ocrPerson(mContext, this@AuthTeamActivity) { picPath, result -> .ocrPerson(mContext, this@AuthTeamActivity) { picPath, result ->
if (result?.data?.face == null) {
ToastUtils.showToast(mContext, "请选择正确证件照片")
return@ocrPerson
}
ImageLoader.getInstance() ImageLoader.getInstance()
.loadRoundImage(mContext, picPath.locPic, 12, ivComFront) .loadRoundImage(mContext, picPath.locPic, 12, ivComFront)
result?.data?.face?.data?.run { result?.data?.face?.data?.run {
@ -81,17 +90,31 @@ class AuthTeamActivity : BaseActivity<ActivityAuthTeamBinding>(), View.OnClickLi
ivComBack.setOnClickListener { ivComBack.setOnClickListener {
OcrUtils.getInstance() OcrUtils.getInstance()
.ocrPerson(mContext, this@AuthTeamActivity) { picPath, result -> .ocrPerson(mContext, this@AuthTeamActivity) { picPath, result ->
if (result?.data?.back == null) {
ToastUtils.showToast(mContext, "请选择正确证件照片")
return@ocrPerson
}
ImageLoader.getInstance() ImageLoader.getInstance()
.loadRoundImage(mContext, picPath.locPic, 12, ivComBack) .loadRoundImage(mContext, picPath.locPic, 12, ivComBack)
result?.data?.back?.data?.run { 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("-")) { if (validPeriod.contains("-")) {
val split = validPeriod.split("-") val split = validPeriod.split("-")
tvStart.text = TimeUtil.changeDateFormat(split[0]) tvStart.text = TimeUtil.changeDateFormat(split[0])
tvEnd.text = if (split.size == 2) TimeUtil.changeDateFormat(split[1]) else "" tvEnd.text =
upComInfoBean.run { if (split.size == 2) TimeUtil.changeDateFormat(split[1]) else ""
// idcardEffectiveStart = TimeUtil.changeDateFormat(split[0]) }
// idcardEffectiveEnd = if (split.size == 2) TimeUtil.changeDateFormat(split[1]) else "" if (validPeriod?.contains("长期") == true) {
idcardBackUrl = picPath.picPath val split = validPeriod.split("长期")
binding.run {
tvStart.text =
TimeUtil.changeDateFormat(split[0])
tvEnd.text = "长期"
} }
} }
} }
@ -101,6 +124,11 @@ class AuthTeamActivity : BaseActivity<ActivityAuthTeamBinding>(), View.OnClickLi
ivFront.setOnClickListener { ivFront.setOnClickListener {
OcrUtils.getInstance() OcrUtils.getInstance()
.ocrPerson(mContext, this@AuthTeamActivity) { picPath, result -> .ocrPerson(mContext, this@AuthTeamActivity) { picPath, result ->
if (result?.data?.face == null) {
ToastUtils.showToast(mContext, "请选择正确证件照片")
return@ocrPerson
}
ImageLoader.getInstance() ImageLoader.getInstance()
.loadRoundImage(mContext, picPath.locPic, 12, ivFront) .loadRoundImage(mContext, picPath.locPic, 12, ivFront)
result?.data?.face?.data?.run { result?.data?.face?.data?.run {
@ -123,18 +151,30 @@ class AuthTeamActivity : BaseActivity<ActivityAuthTeamBinding>(), View.OnClickLi
ivBack.setOnClickListener { ivBack.setOnClickListener {
OcrUtils.getInstance() OcrUtils.getInstance()
.ocrPerson(mContext, this@AuthTeamActivity) { picPath, result -> .ocrPerson(mContext, this@AuthTeamActivity) { picPath, result ->
if (result?.data?.back == null) {
ToastUtils.showToast(mContext, "请选择正确证件照片")
return@ocrPerson
}
ImageLoader.getInstance() ImageLoader.getInstance()
.loadRoundImage(mContext, picPath.locPic, 12, ivBack) .loadRoundImage(mContext, picPath.locPic, 12, ivBack)
result?.data?.back?.data?.run { result?.data?.back?.data?.run {
upPerInfoBean.run {
idcardBackUrl = picPath.picPath
}
if (validPeriod.contains("-")) { if (validPeriod.contains("-")) {
val split = validPeriod.split("-") val split = validPeriod.split("-")
tvPerStart.text = TimeUtil.changeDateFormat(split[0]) 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 { if (validPeriod?.contains("长期") == true) {
idcardEffectiveStart = tvPerStart.text.toString() val split = validPeriod.split("长期")
idcardEffectiveEnd = tvPerEnd.text.toString() binding.run {
idcardBackUrl = picPath.picPath tvPerStart.text =
TimeUtil.changeDateFormat(split[0])
tvPerEnd.text = "长期"
} }
} }
} }
@ -161,10 +201,12 @@ class AuthTeamActivity : BaseActivity<ActivityAuthTeamBinding>(), View.OnClickLi
} }
//道路运输许可证 //道路运输许可证
ivRoad.setOnClickListener { ivRoad.setOnClickListener {
PopsUtils.getInstance().showSimSelPic(mContext) { OcrUtils.getInstance()
// upComInfoBean.roadLicensePhotoUrl = it[0].realPath .noOcrUpPic(mContext, this@AuthTeamActivity) { picPath, ocrResult ->
ImageLoader.getInstance().loadRoundImage(mContext, it[0].realPath, 12, ivRoad) ImageLoader.getInstance()
} .loadRoundImage(mContext, picPath.locPic, 12, ivRoad)
upComInfoBean.roadLicensePhotoUrl = picPath.picPath
}
} }
//公司银行卡 //公司银行卡
@ -180,6 +222,7 @@ class AuthTeamActivity : BaseActivity<ActivityAuthTeamBinding>(), View.OnClickLi
} }
upComInfoBean.run { upComInfoBean.run {
captainBankcardNumber = cardNumber captainBankcardNumber = cardNumber
captainBankcardName = bankName
captainBankcardPhotoUrl = picPath.picPath captainBankcardPhotoUrl = picPath.picPath
} }
} }
@ -188,19 +231,45 @@ class AuthTeamActivity : BaseActivity<ActivityAuthTeamBinding>(), View.OnClickLi
tvComDate.setOnClickListener { tvComDate.setOnClickListener {
PickerUtils.getInstance() PickerUtils.getInstance()
.showDate(this@AuthTeamActivity, "请选择有效期至") { date-> .showDateSim(this@AuthTeamActivity, "请选择有效期至") { date ->
tvComDate.text = date tvComDate.text = date
} }
} }
tvPerStart.setOnClickListener { tvPerStart.setOnClickListener {
PickerUtils.getInstance() PickerUtils.getInstance()
.showDate(this@AuthTeamActivity, "请选择有效期至") { date -> .showDate(this@AuthTeamActivity, "请选择起始日期") { date ->
tvPerStart.text = date tvPerStart.text = date
} }
} }
tvPerEnd.setOnClickListener {
PickerUtils.getInstance()
.showDateSim(this@AuthTeamActivity, "请选择有效期至") { date ->
tvPerEnd.text = date
}
}
btnOk.setOnClickListener(this@AuthTeamActivity) 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<ActivityAuthTeamBinding>(), View.OnClickLi
super.onClick(view) super.onClick(view)
when (view?.id) { when (view?.id) {
binding.btnOk.id -> { binding.btnOk.id -> {
DataManager.getInstance() subMit()
.authenticationCaptain(if (checkTeamType == 1) upComInfoBean else upPerInfoBean)
.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread())
.subscribe(BaseObserver(mContext, object : RxHttpCallBack<Any>(this) {
override fun onSuccess(t: CommonResponseBean<Any>) {
super.onSuccess(t)
}
}))
} }
binding.ivBusiness.id -> {} // binding.ivBusiness.id -> {}
binding.ivComFront.id -> {} // binding.ivComFront.id -> {}
binding.ivComBack.id -> {} // binding.ivComBack.id -> {}
binding.ivComBank.id -> {} // binding.ivComBank.id -> {}
binding.tvComDate.id -> {} // binding.tvComDate.id -> {}
binding.tvPerStart.id -> {} // binding.tvPerStart.id -> {}
binding.ivFront.id -> {} // binding.ivFront.id -> {}
binding.ivBack.id -> {} // binding.ivBack.id -> {}
binding.ivBank.id -> {} // binding.ivBank.id -> {}
binding.ivRoad.id -> {} // binding.ivRoad.id -> {}
} }
} }
private fun subMit() { 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<Any>(this@AuthTeamActivity) {
override fun onSuccess(t: CommonResponseBean<Any>) {
super.onSuccess(t)
ActivityUtils.startActivity(mContext, HomeActivity::class.java)
}
})
)
}
} }

6
app/src/main/java/com/dahe/gldriver/ui/mine/MineFragment.kt
View File

@ -66,7 +66,7 @@ class MineFragment : BaseFragment<FragmentMineBinding>(), View.OnClickListener,
override fun onFragmentFirstVisible() { override fun onFragmentFirstVisible() {
setRefresh(binding.refresh, this) setRefresh(binding.refresh, this)
refreshView() getUserData()
binding.run { binding.run {
//初始化常用工具 //初始化常用工具
@ -183,6 +183,10 @@ class MineFragment : BaseFragment<FragmentMineBinding>(), View.OnClickListener,
} }
override fun getRefreshDate(stat: Int, page: Int, count: Int) { override fun getRefreshDate(stat: Int, page: Int, count: Int) {
getUserData()
}
private fun getUserData(){
DataManager.getInstance().getUserInfo() DataManager.getInstance().getUserInfo()
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())

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

@ -39,17 +39,23 @@ class UserUtils private constructor(){
SPUtils.instance.setUserInfo(context, Gson().toJson(userBean)) SPUtils.instance.setUserInfo(context, Gson().toJson(userBean))
//设置推送别名 //设置推送别名
PushHelper.setAlias(context,userBean) PushHelper.setAlias(context,userBean)
if (userBean.isCarCaptain == "9") {//是否是车队长（0=否,1=是,9=未选择）
ActivityUtils.startActivity( // TODO: 临时注释替换
context, ActivityUtils.startActivity(
SelectRoleActivity::class.java context,
) SelectRoleActivity::class.java
} else { )
ActivityUtils.startActivity( // if (userBean.isCarCaptain == "9") {//是否是车队长（0=否,1=是,9=未选择）
context, // ActivityUtils.startActivity(
HomeActivity::class.java // context,
) // SelectRoleActivity::class.java
} // )
// } else {
// ActivityUtils.startActivity(
// context,
// HomeActivity::class.java
// )
// }
ActivityUtils.finishToActivity(LoginActivity::class.java,true) ActivityUtils.finishToActivity(LoginActivity::class.java,true)
} }

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

@ -169,11 +169,12 @@
<TextView <TextView
android:layout_width="@dimen/dp_100" android:layout_width="@dimen/dp_100"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="经营许可证号" android:text="道路许可证号"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="@dimen/sp_15"></TextView> android:textSize="@dimen/sp_15"></TextView>
<EditText <EditText
android:id="@+id/etRootId"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="@dimen/dp_34" android:layout_height="@dimen/dp_34"
android:layout_marginLeft="@dimen/dp_10" android:layout_marginLeft="@dimen/dp_10"