From 643b50b20ac531eeb563c4c6e085c207f0f7f5f3 Mon Sep 17 00:00:00 2001
From: lijia <john_095130@163.com>
Date: Thu, 11 Apr 2024 08:55:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=82=E8=BD=A6=E6=8F=90=E7=A4=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/dahe/gldriver/net/Api.kt                | 4 ++--
 .../gldriver/ui/account/authperson/AuthTrailerActivity.kt     | 4 ++--
 .../gldriver/ui/account/authperson/EditTrailerActivity.kt     | 4 ++--
 app/src/main/res/layout/activity_car_detail.xml               | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/dahe/gldriver/net/Api.kt b/app/src/main/java/com/dahe/gldriver/net/Api.kt
index 55b72ca..64c386d 100644
--- a/app/src/main/java/com/dahe/gldriver/net/Api.kt
+++ b/app/src/main/java/com/dahe/gldriver/net/Api.kt
@@ -353,14 +353,14 @@ interface Api {
      * 新增挂车信息
      * */
     @POST(BASE_URL + "driver/car/addTrailer")
-    fun addTrailer(@Body upDrivingInfoBean: UpDrivingInfoBean): Observable<CommonResponseBean<Int>>
+    fun addTrailer(@Body upDrivingInfoBean: UpDrivingInfoBean): Observable<CommonResponseBean<Any>>
 
     /**
      *
      * 修改挂车信息
      * */
     @POST(BASE_URL + "driver/car/editTrailer")
-    fun editTrailer(@Body upDrivingInfoBean: UpDrivingInfoBean): Observable<CommonResponseBean<Int>>
+    fun editTrailer(@Body upDrivingInfoBean: UpDrivingInfoBean): Observable<CommonResponseBean<Any>>
 
     /**
      *
diff --git a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthTrailerActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthTrailerActivity.kt
index d4e8928..7acdb9c 100644
--- a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthTrailerActivity.kt
+++ b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthTrailerActivity.kt
@@ -175,8 +175,8 @@ class AuthTrailerActivity : BaseActivity<ActivityAuthTrailerBinding>() {
         DataManager.getInstance().addTrailer(upDrivingInfoBean)
             .subscribeOn(Schedulers.io())
             .observeOn(AndroidSchedulers.mainThread())
-            .subscribe(BaseObserver(mContext, object : RxHttpCallBack<Int>() {
-                override fun onSuccess(t: CommonResponseBean<Int>) {
+            .subscribe(BaseObserver(mContext, object : RxHttpCallBack<Any>() {
+                override fun onSuccess(t: CommonResponseBean<Any>) {
                     super.onSuccess(t)
                     ActivityUtils.startActivity(mContext, AuthSuccActivity::class.java)
                 }
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 2b56e55..d56a846 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
@@ -225,8 +225,8 @@ class EditTrailerActivity : BaseActivity<ActivityAuthTrailerBinding>() {
         DataManager.getInstance().editTrailer(upDrivingInfoBean)
             .subscribeOn(Schedulers.io())
             .observeOn(AndroidSchedulers.mainThread())
-            .subscribe(BaseObserver(mContext, object : RxHttpCallBack<Int>() {
-                override fun onSuccess(t: CommonResponseBean<Int>) {
+            .subscribe(BaseObserver(mContext, object : RxHttpCallBack<Any>() {
+                override fun onSuccess(t: CommonResponseBean<Any>) {
                     super.onSuccess(t)
                     showToast("修改成功")
                     setResult(RESULT_OK)
diff --git a/app/src/main/res/layout/activity_car_detail.xml b/app/src/main/res/layout/activity_car_detail.xml
index 182861a..cd7b2a4 100644
--- a/app/src/main/res/layout/activity_car_detail.xml
+++ b/app/src/main/res/layout/activity_car_detail.xml
@@ -286,6 +286,7 @@
 
 
                     <LinearLayout
+                        android:id="@+id/llDriver"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_below="@+id/tvDriverInfo"
@@ -299,7 +300,6 @@
                             android:background="@color/color_c" />
 
                         <LinearLayout
-                            android:id="@+id/llDriver"
                             android:layout_width="match_parent"
                             android:layout_height="@dimen/dp_46"
                             android:gravity="center"