From 7e565e98a4401fc7daca52ff92beb0e35aada66c Mon Sep 17 00:00:00 2001
From: niushuai233 <shuai.niu@foxmail.com>
Date: Mon, 22 Apr 2024 10:32:35 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20:+1:=20=E5=88=87=E6=8D=A2=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=AF=BC=E8=87=B4=E9=A6=96=E9=A1=B5=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E9=94=99=E4=B9=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/calendar/CalendarFragment.java         | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/cc/niushuai/dididone/ui/calendar/CalendarFragment.java b/app/src/main/java/cc/niushuai/dididone/ui/calendar/CalendarFragment.java
index e5331c0..1d6158c 100644
--- a/app/src/main/java/cc/niushuai/dididone/ui/calendar/CalendarFragment.java
+++ b/app/src/main/java/cc/niushuai/dididone/ui/calendar/CalendarFragment.java
@@ -32,6 +32,8 @@ import com.necer.painter.InnerPainter;
 import com.necer.utils.CalendarUtil;
 
 import org.joda.time.LocalDate;
+import org.joda.time.format.DateTimeFormatter;
+import org.joda.time.format.ISODateTimeFormat;
 import org.reactivestreams.Subscription;
 
 import java.util.List;
@@ -85,7 +87,11 @@ public class CalendarFragment extends BaseFragment {
 
         XLog.d("lastDate: {}", lastDate);
         if (StrUtil.isNotEmpty(lastDate)) {
+            binding.miui10Calendar.setInitializeDate(lastDate);
             rebuildRecordListViewByDate(lastDate);
+
+            LocalDate localDate = LocalDate.parse(lastDate, ISODateTimeFormat.date());
+            setLunarDateLabel(localDate);
         }
 
         // 构建弹出框内容
@@ -224,13 +230,7 @@ public class CalendarFragment extends BaseFragment {
                 }
 
                 XLog.d("当前选中 " + localDate);
-                Lunar lunar = CalendarUtil.getCalendarDate(localDate).lunar;
-                String lunarDate = lunar.chineseEra + "年" + lunar.lunarMonthStr + lunar.lunarDayStr;
-
-                // 重置上次选中日期
-                lastDate = localDate.toString();
-
-                binding.tvResult.setText(StrUtil.format("{} | {}", lastDate, lunarDate));
+                setLunarDateLabel(localDate);
 
                 // 重组日期
                 rebuildRecordListViewByDate(lastDate);
@@ -239,6 +239,16 @@ public class CalendarFragment extends BaseFragment {
 
     }
 
+    private void setLunarDateLabel(LocalDate localDate) {
+        Lunar lunar = CalendarUtil.getCalendarDate(localDate).lunar;
+        String lunarDate = lunar.chineseEra + "年" + lunar.lunarMonthStr + lunar.lunarDayStr;
+
+        // 重置上次选中日期
+        lastDate = localDate.toString();
+
+        binding.tvResult.setText(StrUtil.format("{} | {}", lastDate, lunarDate));
+    }
+
     private void rebuildRecordListViewByDate(String date) {
         DateTime dateTime = DateUtil.parseDate(date);
         // 移除所有旧内容项