From 3b7a77c45ba5bc4d53163431cbea53ff87262443 Mon Sep 17 00:00:00 2001
From: lijia <john_095130@163.com>
Date: Fri, 6 Dec 2024 09:45:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A7=E6=BA=90=E8=AF=A6=E6=83=85=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E9=80=89=E4=B8=AD=E6=8C=87=E6=B4=BE=E8=BD=A6=E8=BE=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bean/HuoYuanDelBean.java                  | 19 +++++++++++++++++++
 .../ui/home/HuoYunDelActivity.java            |  6 +++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/HuoYuanDelBean.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/HuoYuanDelBean.java
index 7bfc1a9..254836f 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/HuoYuanDelBean.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/HuoYuanDelBean.java
@@ -83,6 +83,8 @@ public class HuoYuanDelBean {
         private String vehicleTypeName;
         private int vehicleLength;
         private String vehicleLengthName;
+        private String carNumber;
+        private String carId;
         private String namedDrivers;
         private String requirement;
         private String totalFreight;
@@ -97,6 +99,23 @@ public class HuoYuanDelBean {
         private Object contactName;
         private Object contactPhone;
 
+
+        public String getCarNumber() {
+            return carNumber == null ? "" : carNumber;
+        }
+
+        public void setCarNumber(String carNumber) {
+            this.carNumber = carNumber;
+        }
+
+        public String getCarId() {
+            return carId == null ? "" : carId;
+        }
+
+        public void setCarId(String carId) {
+            this.carId = carId;
+        }
+
         public int getId() {
             return id;
         }
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HuoYunDelActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HuoYunDelActivity.java
index 7419ce3..1aabcc8 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HuoYunDelActivity.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HuoYunDelActivity.java
@@ -315,7 +315,11 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
                     });
                     //
                     ImageButton xuanze = v.findViewById(R.id.xuanze);
-                    if (clb != null && clb.getData().size() == 1) {
+
+                    if (hyd!=null&&hyd.getData()!=null&& !TextUtils.isEmpty(hyd.getData().getCarNumber())){
+                        cid = hyd.getData().getCarId();
+                        car.setText("选择车辆:" + hyd.getData().getCarNumber());
+                    }else if (clb != null && clb.getData().size() == 1) {
                         cid = clb.getData().get(0).getCarId();
                         car.setText("选择车辆:" + clb.getData().get(0).getCarNumber());
                     }