From 89c9ff90b083e8300b81d44e2adaf50175059783 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=E6=BC=8F=E6=B4=9E?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=8C=E6=88=90?= <>
Date: Sat, 22 Mar 2025 10:39:32 +0800
Subject: [PATCH] 1.2.4 release

---
 app/build.gradle                                          | 4 ++--
 .../java/com/rehome/dywoa/ui/activity/LoginActivity.kt    | 4 ++--
 .../main/java/com/rehome/dywoa/utils/DataPassUtils.java   | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 0d9c3e2..f08693b 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "com.rehome.dywoa"
         minSdk 24
         targetSdk 35
-        versionCode 24
-        versionName "1.2.3"
+        versionCode 25
+        versionName "1.2.4"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         //每个应用拥有不同的authorities，防止相同的在同一个手机上无法同时安装
diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/LoginActivity.kt b/app/src/main/java/com/rehome/dywoa/ui/activity/LoginActivity.kt
index 689c0bd..a49ee03 100755
--- a/app/src/main/java/com/rehome/dywoa/ui/activity/LoginActivity.kt
+++ b/app/src/main/java/com/rehome/dywoa/ui/activity/LoginActivity.kt
@@ -209,8 +209,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
 //            binding.etPassword.setText("A000000a.")
 
             //ceshi1
-            binding.etUsername.setText("ceshi1")
-            binding.etPassword.setText("A000000a.")
+//            binding.etUsername.setText("ceshi1")
+//            binding.etPassword.setText("A000000a.")
 
 
             //瑞洪 RH00002/王总  RH00002/chao工 RH00003/范红波
diff --git a/app/src/main/java/com/rehome/dywoa/utils/DataPassUtils.java b/app/src/main/java/com/rehome/dywoa/utils/DataPassUtils.java
index 200d666..c47b890 100755
--- a/app/src/main/java/com/rehome/dywoa/utils/DataPassUtils.java
+++ b/app/src/main/java/com/rehome/dywoa/utils/DataPassUtils.java
@@ -10,7 +10,7 @@ public class DataPassUtils {
         try {
             //格式化日期的对象(转化成习惯的时间格式)
             SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy年MM月dd日");
-            Date date = sdFormat.parse("2025年03月21日");
+            Date date = sdFormat.parse("2025年09月21日");
             Calendar calendarOne = Calendar.getInstance();
             calendarOne.setTime(date);
             if (!Calendar.getInstance().after(calendarOne)) {
@@ -27,7 +27,7 @@ public class DataPassUtils {
         try {
             //格式化日期的对象(转化成习惯的时间格式)
             SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy年MM月dd日");
-            Date date = sdFormat.parse("2026年03月21日");
+            Date date = sdFormat.parse("2026年09月21日");
             Calendar calendarOne = Calendar.getInstance();
             calendarOne.setTime(date);
             if (!Calendar.getInstance().after(calendarOne)) {
@@ -43,7 +43,7 @@ public class DataPassUtils {
         try {
             //格式化日期的对象(转化成习惯的时间格式)
             SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy年MM月dd日");
-            Date date = sdFormat.parse("2025年03月22日");
+            Date date = sdFormat.parse("2025年09月22日");
             Calendar calendarOne = Calendar.getInstance();
             calendarOne.setTime(date);
             if (!Calendar.getInstance().after(calendarOne)) {
@@ -58,7 +58,7 @@ public class DataPassUtils {
         try {
             //格式化日期的对象(转化成习惯的时间格式)
             SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy年MM月dd日");
-            Date date = sdFormat.parse("2025年03月23日");
+            Date date = sdFormat.parse("2025年09月23日");
             Calendar calendarOne = Calendar.getInstance();
             calendarOne.setTime(date);
             if (!Calendar.getInstance().after(calendarOne)) {