From 7d8ce5d27289e41065b5b0e2d2bd681afacb1e37 Mon Sep 17 00:00:00 2001
From: shixianjie <shixianjie@hjx.com>
Date: Thu, 26 Sep 2024 17:43:55 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=99=E9=A2=98=E5=88=97=E8=A1=A8=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/hjx/parent/adapter/HomeworkAdapter.java  | 14 ++++++++++++++
 .../java/com/hjx/parent/fragment/ErrorFragment.java   |  4 ++++
 .../com/prws/common/bean/homework/HomeworkList.java   | 19 ++++++++++++++++++-
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/hjx/parent/adapter/HomeworkAdapter.java b/app/src/main/java/com/hjx/parent/adapter/HomeworkAdapter.java
index fe28e36..990c183 100644
--- a/app/src/main/java/com/hjx/parent/adapter/HomeworkAdapter.java
+++ b/app/src/main/java/com/hjx/parent/adapter/HomeworkAdapter.java
@@ -1,5 +1,8 @@
 package com.hjx.parent.adapter;
 
+import android.view.View;
+import android.widget.TextView;
+
 import androidx.annotation.NonNull;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
@@ -36,5 +39,16 @@ public class HomeworkAdapter extends BaseQuickAdapter<HomeworkList, BaseViewHold
                 subjectImg = R.drawable.ic_math;
         }
         helper.setImageResource(R.id.ivSubject, subjectImg);
+
+        TextView tvDate = helper.getView(R.id.tvDate);
+        int index = getData().indexOf(homework);
+        if (index == 0) {
+            tvDate.setVisibility(View.VISIBLE);
+        } else if (!homework.getFormatTime().equals(getData().get(index - 1).getFormatTime())) {
+            tvDate.setVisibility(View.VISIBLE);
+        } else {
+            tvDate.setVisibility(View.GONE);
+        }
+        tvDate.setText(homework.getFormatTime());
     }
 }
diff --git a/app/src/main/java/com/hjx/parent/fragment/ErrorFragment.java b/app/src/main/java/com/hjx/parent/fragment/ErrorFragment.java
index 64a3253..49a6685 100644
--- a/app/src/main/java/com/hjx/parent/fragment/ErrorFragment.java
+++ b/app/src/main/java/com/hjx/parent/fragment/ErrorFragment.java
@@ -60,6 +60,7 @@ import com.zhangteng.utils.IHandlerCallBack;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -265,6 +266,9 @@ public class ErrorFragment extends BaseRxFragment<FragmentErrorBookBinding> {
                 .map(ResponseResult::getData)
                 .subscribe((data, th) -> {
                     if (th != null) th.printStackTrace();
+                    if (data != null) {
+                        Collections.sort(data);
+                    }
                     homeworkAdapter.setNewData(data);
                 });
     }
diff --git a/libs/common/src/main/java/com/prws/common/bean/homework/HomeworkList.java b/libs/common/src/main/java/com/prws/common/bean/homework/HomeworkList.java
index ead35b4..a7bf936 100644
--- a/libs/common/src/main/java/com/prws/common/bean/homework/HomeworkList.java
+++ b/libs/common/src/main/java/com/prws/common/bean/homework/HomeworkList.java
@@ -2,9 +2,11 @@ package com.prws.common.bean.homework;
 
 import com.google.gson.annotations.SerializedName;
 
+import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Locale;
 
-public class HomeworkList {
+public class HomeworkList implements Comparable<HomeworkList> {
 
     @SerializedName(value = "homeworkId", alternate = "id")
     private Integer homeworkId;
@@ -87,4 +89,19 @@ public class HomeworkList {
         return completeFlag;
     }
 
+    @Override
+    public int compareTo(HomeworkList other) {
+        long time1 = this.uploadTime == null ? 0 : this.uploadTime.getTime();
+        long time2 = other.uploadTime == null ? 0 : other.uploadTime.getTime();
+        return (int) (time2 - time1);
+    }
+
+    private String time;
+    private SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA);
+    public String getFormatTime() {
+        if (uploadTime == null) return "";
+        if (time != null) return time;
+        time = format.format(uploadTime);
+        return time;
+    }
 }
-- 
1.9.0