From b1355100e264facce432e2e6ef1e5963c18e4d23 Mon Sep 17 00:00:00 2001
From: lijia <john_095130@163.com>
Date: Tue, 23 Apr 2024 17:31:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E7=9F=A5=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/account/authperson/AuthDriverActivity.kt    |  4 +++-
 .../ui/account/authperson/EditDriverActivity.kt    |  4 +++-
 app/src/main/res/layout/activity_auth_road.xml     |  1 +
 app/src/main/res/layout/fragment_home.xml          | 14 +++++++++-----
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthDriverActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthDriverActivity.kt
index 0c39e3c..f0109cb 100644
--- a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthDriverActivity.kt
+++ b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthDriverActivity.kt
@@ -92,7 +92,9 @@ class AuthDriverActivity : BaseActivity<ActivityAuthDriverBinding>() {
                 licenseEffectiveEnd = tvEnd.text.toString()
             }
         }
-        if (driverInfoBean.licenseNo.isNullOrBlank() || driverInfoBean.licensePhotoBackUrl.isNullOrBlank()) {
+        if (driverInfoBean.licenseName.isNullOrBlank() || driverInfoBean.licensePhotoBackUrl.isNullOrBlank()||
+            driverInfoBean.licenseNo.isNullOrBlank()||driverInfoBean.licenseType.isNullOrBlank()||
+            driverInfoBean.licenseEffectiveStart.isNullOrBlank()||driverInfoBean.licenseEffectiveEnd.isNullOrBlank()) {
             ToastUtils.showToast(mContext, "请完善信息")
             return
         }
diff --git a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/EditDriverActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/EditDriverActivity.kt
index e006f10..dd825b7 100644
--- a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/EditDriverActivity.kt
+++ b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/EditDriverActivity.kt
@@ -126,7 +126,9 @@ class EditDriverActivity : BaseActivity<ActivityAuthDriverBinding>() {
                 licenseEffectiveEnd = tvEnd.text.toString()
             }
         }
-        if (driverInfoBean.licenseNo.isNullOrBlank() || driverInfoBean.licensePhotoBackUrl.isNullOrBlank()) {
+        if (driverInfoBean.licenseName.isNullOrBlank() || driverInfoBean.licensePhotoBackUrl.isNullOrBlank()||
+            driverInfoBean.licenseNo.isNullOrBlank()||driverInfoBean.licenseType.isNullOrBlank()||
+            driverInfoBean.licenseEffectiveStart.isNullOrBlank()||driverInfoBean.licenseEffectiveEnd.isNullOrBlank()) {
             ToastUtils.showToast(mContext, "请完善信息")
             return
         }
diff --git a/app/src/main/res/layout/activity_auth_road.xml b/app/src/main/res/layout/activity_auth_road.xml
index 918f186..0667145 100644
--- a/app/src/main/res/layout/activity_auth_road.xml
+++ b/app/src/main/res/layout/activity_auth_road.xml
@@ -102,6 +102,7 @@
                     android:background="@null"
                     android:gravity="right|center_vertical"
                     android:hint="请输入道路运输证号"
+                    android:inputType="number"
                     android:maxLines="1"
                     android:paddingRight="@dimen/dp_10"
                     android:singleLine="true"
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 2c4aabe..d38ce10 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -2,8 +2,7 @@
 <com.scwang.smart.refresh.layout.SmartRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/refresh"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    >
+    android:layout_height="match_parent">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -187,20 +186,25 @@
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/recyclerView"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/dp_14"
                 android:paddingTop="@dimen/dp_24"
                 android:paddingRight="@dimen/dp_14"></androidx.recyclerview.widget.RecyclerView>
 
-            <LinearLayout
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
 
+            <LinearLayout
                 android:id="@+id/llNotic"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/dp_36"
                 android:background="#FFEDE5"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
-                android:paddingLeft="@dimen/dp_8">
+                android:paddingLeft="@dimen/dp_8"
+                android:visibility="gone">
 
                 <TextView
                     android:layout_width="wrap_content"