From a291be17a07e3f657f5871675709d7ff76fe35b6 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 11 四月 2024 18:04:09 +0800
Subject: [PATCH] 2024年04月11日18:04:06

---
 app/src/main/java/com/hdl/photovoltaic/other/HdlMessageLogic.java |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlMessageLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlMessageLogic.java
index 54702bc..c3e0a85 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlMessageLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlMessageLogic.java
@@ -130,6 +130,18 @@
 
         }
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            unReadList.sort(new Comparator<MessageBean>() {
+                @Override
+                public int compare(MessageBean o1, MessageBean o2) {
+                    if (o1 == null && o2 == null) {
+                        return -1;
+                    }
+                    //鍊掑簭锛堥『搴� Long.compare(o2.getCreateTime(), o1.getCreateTime())锛�
+                    return Long.compare(o2.getCreateTime(), o1.getCreateTime());
+                }
+            });
+        }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             readList.sort(new Comparator<MessageBean>() {
                 @Override
                 public int compare(MessageBean o1, MessageBean o2) {
@@ -137,11 +149,10 @@
                         return -1;
                     }
                     //鍊掑簭锛堥『搴� Long.compare(o2.getCreateTime(), o1.getCreateTime())锛�
-                    return Long.compare(o1.getCreateTime(), o2.getCreateTime());
+                    return Long.compare(o2.getCreateTime(), o1.getCreateTime());
                 }
             });
         }
-
         if (unReadList.size() > 0) {
             newList.addAll(unReadList);
         }
@@ -181,7 +192,8 @@
                     break;
                 }
             }
-        } catch (Exception ignored) {
+        } catch (Exception e) {
+            String ss = e.getMessage();
         }
     }
 

--
Gitblit v1.8.0