更换银行卡

app/src/main/AndroidManifest.xml

@@ -92,15 +92,16 @@
             android:name="com.amap.api.v2.apikey"
             android:value="e0c32c80b14f78b770b3671add9c4515" />
 
-        <service android:name="com.amap.api.location.APSService"
+        <service
-            android:foregroundServiceType="location"/>
+            android:name="com.amap.api.location.APSService"
+            android:foregroundServiceType="location" />
 
         <meta-data
             android:name="com.google.firebase.messaging.default_notification_icon"
             android:resource="@mipmap/app_icon" />
 
-        <service android:name=".service.UpLocationService"/>
+        <service android:name=".service.UpLocationService" />
-        <service android:name=".service.UpLocationService2"/>
+        <service android:name=".service.UpLocationService2" />
 
         <activity
             android:name=".ui.LauncherActivity"
@@ -217,6 +218,11 @@
             android:configChanges="keyboardHidden|orientation|locale"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan|stateHidden" />
+        <activity
+            android:name=".ui.account.authperson.EditBankCardActivity"
+            android:configChanges="keyboardHidden|orientation|locale"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustPan|stateHidden" />
         <activity
             android:name=".ui.account.authperson.EditTrailerActivity"
             android:configChanges="keyboardHidden|orientation|locale"

app/src/main/java/com/dahe/gldriver/net/Api.kt

@@ -192,7 +192,7 @@ interface Api {
      * 司机重新上传银行卡
      * */
     @POST(BASE_URL + "driver/driver/reUpDriverBankCard")
-    fun reUpDriverBankCard(@Body bankBean: UpBankInfoBean): Observable<CommonResponseBean<Any>>
+    fun reUpDriverBankCard(@Body bankBean: UserDetail): Observable<CommonResponseBean<Any>>
 
     /**
      * 查询司机证件完整度信息

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<ActivityAuthBankcardBinding>() {
 
     private fun selBankPic() {
         PopsUtils.getInstance().showSimSelPic(mContext) { it ->
-            var data = it[0]
+            var data1 = it[0]
-            ossServiceUtil.asyncPutImage(data.realPath, this@AuthBankCardActivity)
+            ossServiceUtil.asyncPutImage(data1.realPath, this@AuthBankCardActivity)
             ossServiceUtil.setResultCallBack { data, oldPath ->
                 DataManager.getInstance().recognizeBankCard(oldPath)
                     .subscribeOn(Schedulers.io())
@@ -60,11 +61,16 @@ class AuthBankCardActivity : BaseActivity<ActivityAuthBankcardBinding>() {
                                 override fun onSuccess(t: CommonResponseBean<OcrPersonBean>) {
                                     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<ActivityAuthBankcardBinding>() {
 
             }
 
-            ImageLoader.getInstance().loadRoundImage(mContext, data.realPath, 12, binding.ivFront)
+
         }
     }
 
@@ -84,6 +90,11 @@ class AuthBankCardActivity : BaseActivity<ActivityAuthBankcardBinding>() {
             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())

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<ActivityAuthBankcardBinding>() {
+    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<UserDetail>() {
+                override fun onSuccess(t: CommonResponseBean<UserDetail>) {
+                    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<OcrPersonBean>(this) {
+                                override fun onSuccess(t: CommonResponseBean<OcrPersonBean>) {
+                                    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<Any>() {
+                    override fun onSuccess(t: CommonResponseBean<Any>) {
+                        super.onSuccess(t)
+                        finish()
+                    }
+                }))
+        }
+    }
+}

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<ActivityWalletBinding>() {
     override fun initView(savedInstanceState: Bundle?) {
         setStatusHeightParams(binding.rlTop)
-        setTitleBar("钱包",true,true)
+        setTitleBar("钱包",true,true,"更换银行卡"){
+            ActivityUtils.startActivity(mContext,EditBankCardActivity::class.java)
+        }
     }
 
     override fun initDate() {

app/src/main/res/layout/activity_auth_bankcard.xml

@@ -10,6 +10,7 @@
     <include layout="@layout/common_toolbar"></include>
 
     <TextView
+        android:id="@+id/tvNote"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="#FFEFE8"
@@ -124,19 +125,19 @@
                     android:textColor="@color/black"
                     android:textSize="@dimen/sp_15"></TextView>
 
-                <TextView
+                <EditText
                     android:id="@+id/tvBankName"
                     android:layout_width="0dp"
                     android:layout_height="@dimen/dp_34"
                     android:layout_marginLeft="@dimen/dp_10"
                     android:layout_weight="1"
-                    android:drawableRight="@drawable/right_gray"
+                    android:background="@null"
+                    android:hint="请输入开户行"
                     android:drawablePadding="@dimen/dp_6"
                     android:gravity="right|center_vertical"
-                    android:hint="请选择开户行"
                     android:paddingLeft="@dimen/dp_10"
                     android:textColor="@color/black"
-                    android:textSize="@dimen/sp_15"></TextView>
+                    android:textSize="@dimen/sp_15"></EditText>
             </LinearLayout>