From 246b89c6d1196d5727fabf5dc0503ad030bd757a Mon Sep 17 00:00:00 2001
From: lijia <john_095130@163.com>
Date: Mon, 15 Apr 2024 09:02:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BB=9F=E4=B8=80=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E7=BB=93=E6=9D=9F=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/account/authperson/EditTrailerActivity.kt    | 13 ++++++++-----
 .../java/com/dahe/gldriver/ui/home/HomeFragment.kt  |  2 +-
 .../gldriver/ui/mine/activity/CarDetailActivity.kt  | 10 +++++++++-
 app/src/main/res/layout/activity_auth_bankcard.xml  |  1 +
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/EditTrailerActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/EditTrailerActivity.kt
index d56a846..844a528 100644
--- a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/EditTrailerActivity.kt
+++ b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/EditTrailerActivity.kt
@@ -55,7 +55,7 @@ class EditTrailerActivity : BaseActivity<ActivityAuthTrailerBinding>() {
                         this@EditTrailerActivity,
                         "重型自卸半挂车",
                         true
-                    ) { position, item ->
+                    ) { _, item ->
                         var data = item as DiCarColor
                         tvCarType.text = data.dictLabel
                         upDrivingInfoBean.run {
@@ -145,8 +145,8 @@ class EditTrailerActivity : BaseActivity<ActivityAuthTrailerBinding>() {
      */
     private fun selFrontPic() {
         OcrUtils.getInstance().ocrDriveing(mContext, this) { picPath, result ->
-            if (result?.data?.face==null){
-                ToastUtils.showToast(mContext,"请选择正确证件照片")
+            if (result?.data?.face == null) {
+                ToastUtils.showToast(mContext, "请选择正确证件照片")
                 return@ocrDriveing
             }
             ImageLoader.getInstance()
@@ -179,8 +179,8 @@ class EditTrailerActivity : BaseActivity<ActivityAuthTrailerBinding>() {
     private fun selBackPic() {
 
         OcrUtils.getInstance().ocrDriveing(mContext, this) { picPath, result ->
-            if (result?.data?.back==null){
-                ToastUtils.showToast(mContext,"请选择正确证件照片")
+            if (result?.data?.back == null) {
+                ToastUtils.showToast(mContext, "请选择正确证件照片")
                 return@ocrDriveing
             }
             ImageLoader.getInstance()
@@ -205,6 +205,8 @@ class EditTrailerActivity : BaseActivity<ActivityAuthTrailerBinding>() {
 
 
     private fun subMint() {
+
+
         if (binding.tvCarType.text.isNullOrEmpty() ||
             binding.etCarNum.text.isNullOrEmpty() ||
             binding.tvCarColor.text.isNullOrEmpty() ||
@@ -220,6 +222,7 @@ class EditTrailerActivity : BaseActivity<ActivityAuthTrailerBinding>() {
             vehicleNum = binding.etCarNum.text.trim().toString()
             vehicleType = binding.tvCarType.text.trim().toString()//车辆类型
             trailerPlateColor = binding.tvCarColor.text.trim().toString()
+            carId = if (this@EditTrailerActivity.carId.toIntOrNull() != null) this@EditTrailerActivity.carId else ""
         }
 
         DataManager.getInstance().editTrailer(upDrivingInfoBean)
diff --git a/app/src/main/java/com/dahe/gldriver/ui/home/HomeFragment.kt b/app/src/main/java/com/dahe/gldriver/ui/home/HomeFragment.kt
index f0f82c1..7fdbb0e 100644
--- a/app/src/main/java/com/dahe/gldriver/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/dahe/gldriver/ui/home/HomeFragment.kt
@@ -142,7 +142,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(), RefreshCallBack {
     private fun initData() {
         DataManager.getInstance().orderList()
             .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread())
-            .subscribe(BaseObserver(mContext, object : RxHttpCallBack<MutableList<OrderBean>>() {
+            .subscribe(BaseObserver(mContext, object : RxHttpCallBack<MutableList<OrderBean>>(binding.refresh) {
                 override fun onSuccess(t: CommonResponseBean<MutableList<OrderBean>>) {
                     super.onSuccess(t)
                     if (mRefreshPage === 1) {
diff --git a/app/src/main/java/com/dahe/gldriver/ui/mine/activity/CarDetailActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/mine/activity/CarDetailActivity.kt
index 0294dc6..ea76517 100644
--- a/app/src/main/java/com/dahe/gldriver/ui/mine/activity/CarDetailActivity.kt
+++ b/app/src/main/java/com/dahe/gldriver/ui/mine/activity/CarDetailActivity.kt
@@ -87,7 +87,15 @@ class CarDetailActivity : BaseActivity<ActivityCarDetailBinding>(), View.OnClick
                         putString(AppConfig.CAR_ID, CarDetail.vehicleNum)
                     })
 
-                btnDriver.id, llAgainDriver.id -> ActivityUtils.startActivityForResult(
+                //挂车去上传
+                btnDriver.id -> ActivityUtils.startActivityForResult(
+                    this@CarDetailActivity,
+                    EditTrailerActivity::class.java, Bundle().apply {
+                        putString(AppConfig.CAR_ID, CarDetail.carId.toString())
+                    }, 1
+                )
+                //挂车重新上传
+                llAgainDriver.id -> ActivityUtils.startActivityForResult(
                     this@CarDetailActivity,
                     EditTrailerActivity::class.java, Bundle().apply {
                         putString(AppConfig.CAR_ID, CarDetail.trailerVehicleNum)
diff --git a/app/src/main/res/layout/activity_auth_bankcard.xml b/app/src/main/res/layout/activity_auth_bankcard.xml
index 2c28dd2..275908d 100644
--- a/app/src/main/res/layout/activity_auth_bankcard.xml
+++ b/app/src/main/res/layout/activity_auth_bankcard.xml
@@ -134,6 +134,7 @@
                     android:background="@null"
                     android:hint="请输入开户行"
                     android:drawablePadding="@dimen/dp_6"
+                    android:paddingRight="@dimen/dp_10"
                     android:gravity="right|center_vertical"
                     android:paddingLeft="@dimen/dp_10"
                     android:textColor="@color/black"