diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8d8629e..0bbbcc6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -92,15 +92,16 @@
android:name="com.amap.api.v2.apikey"
android:value="e0c32c80b14f78b770b3671add9c4515" />
-
+
-
-
+
+
+
>
+ fun reUpDriverBankCard(@Body bankBean: UserDetail): Observable>
/**
* 查询司机证件完整度信息
diff --git a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthBankCardActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthBankCardActivity.kt
index e0877c6..f47f4d5 100644
--- a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthBankCardActivity.kt
+++ b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthBankCardActivity.kt
@@ -14,6 +14,7 @@ import com.dahe.mylibrary.net.CommonResponseBean
import com.dahe.mylibrary.utils.ActivityUtils
import com.dahe.mylibrary.utils.ImageLoader
import com.dahe.mylibrary.utils.PopsUtils
+import com.dahe.mylibrary.utils.ToastUtils
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
import io.reactivex.rxjava3.schedulers.Schedulers
@@ -48,8 +49,8 @@ class AuthBankCardActivity : BaseActivity() {
private fun selBankPic() {
PopsUtils.getInstance().showSimSelPic(mContext) { it ->
- var data = it[0]
- ossServiceUtil.asyncPutImage(data.realPath, this@AuthBankCardActivity)
+ var data1 = it[0]
+ ossServiceUtil.asyncPutImage(data1.realPath, this@AuthBankCardActivity)
ossServiceUtil.setResultCallBack { data, oldPath ->
DataManager.getInstance().recognizeBankCard(oldPath)
.subscribeOn(Schedulers.io())
@@ -60,11 +61,16 @@ class AuthBankCardActivity : BaseActivity() {
override fun onSuccess(t: CommonResponseBean) {
super.onSuccess(t)
t.data?.data?.run {
+ ImageLoader.getInstance().loadRoundImage(
+ mContext,
+ data1.realPath,
+ 12,
+ binding.ivFront
+ )
bankInfo.driverBankcardPhotoUrl = oldPath
-
binding.let {
it.etId.setText(cardNumber)
- it.tvBankName.text = bankName
+ it.tvBankName.setText(bankName)
}
}
@@ -74,7 +80,7 @@ class AuthBankCardActivity : BaseActivity() {
}
- ImageLoader.getInstance().loadRoundImage(mContext, data.realPath, 12, binding.ivFront)
+
}
}
@@ -84,6 +90,11 @@ class AuthBankCardActivity : BaseActivity() {
bankInfo.driverBankcardNumber = binding.etId.text.toString()
bankInfo.driverBankcardAddress = binding.tvBankName.text.toString()
+ if (this.driverBankcardNumber.isNullOrEmpty() || this.driverBankcardAddress.isNullOrEmpty() || this.driverBankcardPhotoUrl.isNullOrEmpty()) {
+ ToastUtils.showToast(mContext, "请完善资料")
+ return@run
+ }
+
DataManager.getInstance().setUpDriverBankCard(this)
.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
new file mode 100644
index 0000000..99c172f
--- /dev/null
+++ b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/EditBankCardActivity.kt
@@ -0,0 +1,126 @@
+package com.dahe.gldriver.ui.account.authperson
+
+import android.os.Bundle
+import android.view.View
+import com.dahe.gldriver.R
+import com.dahe.gldriver.base.AppConfig
+import com.dahe.gldriver.bean.OcrPersonBean
+import com.dahe.gldriver.bean.UpBankInfoBean
+import com.dahe.gldriver.databinding.ActivityAuthBankcardBinding
+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.glex.bean.UserDetail
+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.PopsUtils
+import com.dahe.mylibrary.utils.ToastUtils
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.schedulers.Schedulers
+
+/**
+ * @ClassName AuthBankCardActivity
+ * @Author john
+ * @Date 2024/1/25 15:31
+ * @Description 银行卡编辑
+ */
+class EditBankCardActivity : BaseActivity() {
+ private var ossServiceUtil: OssServiceUtil = OssServiceUtil.getInstance()
+
+ var perInfoBean: UserDetail = UserDetail()
+ override fun initView(savedInstanceState: Bundle?) {
+ setStatusBarColor(R.color.white)
+ setTitleBar("实名认证", true)
+
+ binding.run {
+ tvNote.visibility = View.GONE
+ btnOk.text = "确定"
+ btnOk.setOnClickListener {
+ subMit()
+ }
+ ivFront.setOnClickListener {
+ selBankPic()
+ }
+ }
+ }
+
+ override fun initDate() {
+ DataManager.getInstance().getUserDetail()
+ .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread())
+ .subscribe(BaseObserver(mContext, object : RxHttpCallBack() {
+ override fun onSuccess(t: CommonResponseBean) {
+ super.onSuccess(t)
+ perInfoBean = t.data
+ binding.run {
+ etId.setText(perInfoBean.driverBankcardNumber)
+ tvBankName.setText(perInfoBean.driverBankcardAddress)
+ ImageLoader.getInstance()
+ .loadRoundImage(
+ mContext,
+ perInfoBean.driverBankcardPhotoUrl,
+ 12,
+ ivFront
+ )
+ }
+ }
+ }))
+ }
+
+
+ private fun selBankPic() {
+ PopsUtils.getInstance().showSimSelPic(mContext) { it ->
+ var data1 = it[0]
+ ossServiceUtil.asyncPutImage(data1.realPath, this@EditBankCardActivity)
+ ossServiceUtil.setResultCallBack { data, oldPath ->
+ DataManager.getInstance().recognizeBankCard(oldPath)
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(
+ BaseObserver(mContext,
+ object : RxHttpCallBack(this) {
+ override fun onSuccess(t: CommonResponseBean) {
+ super.onSuccess(t)
+ t.data?.data?.run {
+ ImageLoader.getInstance().loadRoundImage(mContext, data1.realPath, 12, binding.ivFront)
+ perInfoBean.driverBankcardPhotoUrl = oldPath
+
+ binding.let {
+ it.etId.setText(cardNumber)
+ it.tvBankName.setText(bankName)
+ }
+ }
+ }
+ })
+ )
+
+ }
+
+ }
+ }
+
+ private fun subMit() {
+ perInfoBean.run {
+
+ perInfoBean.driverBankcardNumber = binding.etId.text.toString()
+ perInfoBean.driverBankcardAddress = binding.tvBankName.text.toString()
+
+ if (this.driverBankcardNumber.isNullOrEmpty() || this.driverBankcardAddress.isNullOrEmpty() || this.driverBankcardPhotoUrl.isNullOrEmpty()) {
+ ToastUtils.showToast(mContext, "请完善资料")
+ return@run
+ }
+
+ DataManager.getInstance().reUpDriverBankCard(this)
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(BaseObserver(mContext, object : RxHttpCallBack() {
+ override fun onSuccess(t: CommonResponseBean) {
+ super.onSuccess(t)
+ finish()
+ }
+ }))
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/dahe/gldriver/ui/mine/activity/WalletActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/mine/activity/WalletActivity.kt
index bf5b4ba..4fcc365 100644
--- a/app/src/main/java/com/dahe/gldriver/ui/mine/activity/WalletActivity.kt
+++ b/app/src/main/java/com/dahe/gldriver/ui/mine/activity/WalletActivity.kt
@@ -8,9 +8,11 @@ import androidx.recyclerview.widget.RecyclerView
import com.dahe.gldriver.adapter.CarsAdapter
import com.dahe.gldriver.adapter.WalletAdapter
import com.dahe.gldriver.databinding.ActivityWalletBinding
+import com.dahe.gldriver.ui.account.authperson.EditBankCardActivity
import com.dahe.glex.bean.WayBillBean
import com.dahe.mylibrary.base.BaseActivity
import com.dahe.mylibrary.recycleviewswipe.RecycleViewDivider
+import com.dahe.mylibrary.utils.ActivityUtils
import com.dahe.mylibrary.utils.ConvertUtils
/**
@@ -22,7 +24,9 @@ import com.dahe.mylibrary.utils.ConvertUtils
class WalletActivity : BaseActivity() {
override fun initView(savedInstanceState: Bundle?) {
setStatusHeightParams(binding.rlTop)
- setTitleBar("钱包",true,true)
+ setTitleBar("钱包",true,true,"更换银行卡"){
+ ActivityUtils.startActivity(mContext,EditBankCardActivity::class.java)
+ }
}
override fun initDate() {
diff --git a/app/src/main/res/layout/activity_auth_bankcard.xml b/app/src/main/res/layout/activity_auth_bankcard.xml
index ab00dba..2c28dd2 100644
--- a/app/src/main/res/layout/activity_auth_bankcard.xml
+++ b/app/src/main/res/layout/activity_auth_bankcard.xml
@@ -10,6 +10,7 @@
-
+ android:textSize="@dimen/sp_15">