From 205a6ee7f54153106b696d27d0251116d342cb3f Mon Sep 17 00:00:00 2001
From: lijia <john_095130@163.com>
Date: Tue, 31 Dec 2024 11:03:17 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A9=BE=E9=A9=B6=E8=AF=81=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=B5=B7=E5=A7=8B=E6=88=AA=E6=AD=A2=E6=97=A5=E6=9C=9F=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/auth/CertificatesActivity.java         | 19 +++++++++++++++--
 .../com/dahe/mylibrary/utils/TimeUtil.java    | 21 +++++++++++++++++++
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/CertificatesActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/CertificatesActivity.java
index 9382a1d..e18bf0b 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/CertificatesActivity.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/CertificatesActivity.java
@@ -1220,14 +1220,29 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                     iib.setDriverLicense(str1);
                     iib.setDriverLicenseBackPhoto(backId);
                     iib.setDriverLicensePhoto(fontId);
-                    iib.setEndTime("长期".equals(odl.getData().getEndDate()) ? "2999-12-31" : odl.getData().getEndDate());
+
+                    if ("长期".equals(odl.getData().getEndDate())){
+                        iib.setEndTime("2999-12-31");
+                    }else if (TimeUtil.isValidDate(odl.getData().getEndDate())){//非yyyy-MM-dd格式的日期传""
+                        iib.setEndTime(odl.getData().getEndDate());
+                    }else{
+                        iib.setEndTime("");
+                    }
+//                    iib.setEndTime("长期".equals(odl.getData().getEndDate()) ? "2999-12-31" : odl.getData().getEndDate());
                     iib.setFirstTime(odl.getData().getFirstGetDocDate());
 
 
 //                    iib.setName(odl.getData().getName());
                     iib.setOrganizationName(odl.getData().getIssuingAuthority());
                     iib.setAddress(odl.getData().getAddress());
-                    iib.setStartTime(odl.getData().getBeginDate());
+
+                    if (TimeUtil.isValidDate(odl.getData().getBeginDate())){//非yyyy-MM-dd格式的日期传""
+                        iib.setStartTime(odl.getData().getBeginDate());
+                    }else{
+                        iib.setStartTime("");
+                    }
+
+//                    iib.setStartTime(odl.getData().getBeginDate());
 
                     iib.setSex(odl.getData().getSex());
                     iib.setBirthday(odl.getData().getBirthday());
diff --git a/mylibrary/src/main/java/com/dahe/mylibrary/utils/TimeUtil.java b/mylibrary/src/main/java/com/dahe/mylibrary/utils/TimeUtil.java
index 45a0aee..1b479e8 100644
--- a/mylibrary/src/main/java/com/dahe/mylibrary/utils/TimeUtil.java
+++ b/mylibrary/src/main/java/com/dahe/mylibrary/utils/TimeUtil.java
@@ -307,6 +307,27 @@ public final class TimeUtil {
         return format.format(date);
     }
 
+
+
+    /**
+     * 验证时间字符串是否是yyyy-MM-dd格式
+     *
+     * @param dateStr 需要验证的时间字符串
+     * @return 如果是yyyy-MM-dd格式，返回true；否则返回false
+     */
+    public static boolean isValidDate(String dateStr) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault());
+        sdf.setLenient(false); // 设置不宽容，严格解析
+        try {
+            Date date = sdf.parse(dateStr);
+            // 可以进一步验证解析后的日期是否合法（例如：检查月份天数、闰年等）
+            // 但对于简单的格式验证，这一步通常不是必需的
+            return true;
+        } catch (ParseException e) {
+            return false;
+        }
+    }
+
     /**
      * 将Date类型转为时间戳
      *