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 { .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 { @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; + } }