From 0f87120ce4f4f5274846a9fc77d4a791ca91b611 Mon Sep 17 00:00:00 2001
From: niushuai233 <niushuai951101@gmail.com>
Date: Sun, 15 Mar 2026 09:31:47 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20v1.4=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                               | 2 +-
 .../cc/niushuai/dididone/ui/calendar/CalendarFragment.java     | 3 +++
 .../cc/niushuai/dididone/ui/component/ProjectPopupView.java    | 2 ++
 .../dididone/ui/setting/project/NewProjectActivity.java        | 3 +++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index a43ba80..c3ebb5f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,7 +16,7 @@ android {
         minSdk 24
         targetSdk 32
         versionCode 12
-        versionName "1.3"
+        versionName "1.4"
 
         resValue "string", "weathericons_version", "${versionName}"
 
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 264257c..18a153d 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
@@ -36,6 +36,7 @@ import org.joda.time.format.DateTimeFormatter;
 import org.joda.time.format.ISODateTimeFormat;
 import org.reactivestreams.Subscription;
 
+import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -269,6 +270,8 @@ public class CalendarFragment extends BaseFragment {
             public void onNext(List<Record> recordList) {
                 XLog.d("DataListOnNext 查询到数据: {}", recordList.size());
 
+//                recordList.sort((e1, e2) -> e2.getCreateDate().compareTo(e1.getCreateDate()));
+                recordList.sort(Comparator.comparing(Record::getCreateDate));
                 for (Record record : recordList) {
                     Project project = BizGlobal.getAllProjectMap().get(record.getProjectId());
                     if (null == project) {
diff --git a/app/src/main/java/cc/niushuai/dididone/ui/component/ProjectPopupView.java b/app/src/main/java/cc/niushuai/dididone/ui/component/ProjectPopupView.java
index cdf7846..3717e46 100644
--- a/app/src/main/java/cc/niushuai/dididone/ui/component/ProjectPopupView.java
+++ b/app/src/main/java/cc/niushuai/dididone/ui/component/ProjectPopupView.java
@@ -17,6 +17,7 @@ import com.lxj.xpopup.util.XPopupUtils;
 import com.lxj.xpopup.widget.VerticalRecyclerView;
 import com.mikepenz.iconics.IconicsDrawable;
 
+import java.util.Comparator;
 import java.util.List;
 import java.util.function.Consumer;
 
@@ -56,6 +57,7 @@ public class ProjectPopupView extends BottomPopupView {
         recyclerView = findViewById(R.id.ppv_recyclerView);
         // 构建data
         data = CollUtil.list(false, BizGlobal.getAvailableProjectMap().values());
+//        data.sort(Comparator.comparing(Project::getCreateDate));
         data.sort((e1, e2) -> e2.getCreateDate().compareTo(e1.getCreateDate()));
 
         int projectCount = data.size();
diff --git a/app/src/main/java/cc/niushuai/dididone/ui/setting/project/NewProjectActivity.java b/app/src/main/java/cc/niushuai/dididone/ui/setting/project/NewProjectActivity.java
index 51ce29d..d270c92 100644
--- a/app/src/main/java/cc/niushuai/dididone/ui/setting/project/NewProjectActivity.java
+++ b/app/src/main/java/cc/niushuai/dididone/ui/setting/project/NewProjectActivity.java
@@ -73,6 +73,9 @@ public class NewProjectActivity extends BaseActivity {
     private boolean restore() {
 
         Bundle extras = getIntent().getExtras();
+        if (null == extras) {
+            return false;
+        }
         requestCode = extras.getInt(BizGlobal.REQUEST_CODE);
         long id = extras.getLong(BizGlobal.PROJECT_ID);
         String name = extras.getString(BizGlobal.PROJECT_NAME);