|
|
@@ -5,8 +5,13 @@ package kr.co.zumo.app.lifeplus.view.screen.notification;
|
|
|
|
|
|
import android.os.Handler;
|
|
|
import android.os.Looper;
|
|
|
+import android.util.Log;
|
|
|
|
|
|
+import java.text.SimpleDateFormat;
|
|
|
import java.util.ArrayList;
|
|
|
+import java.util.Calendar;
|
|
|
+import java.util.Collections;
|
|
|
+import java.util.Comparator;
|
|
|
import java.util.List;
|
|
|
|
|
|
import io.reactivex.disposables.Disposable;
|
|
|
@@ -99,6 +104,16 @@ public class NotiModel extends Model implements PushMessageBroker.IPushMessageLi
|
|
|
displayedList = new ArrayList<>();
|
|
|
displayedList.addAll(parsePushBeans());
|
|
|
displayedList.addAll(noticeBeans);
|
|
|
+
|
|
|
+ Collections.sort(displayedList, new Comparator<NoticeBean>() {
|
|
|
+ @Override
|
|
|
+ public int compare(NoticeBean noticeBean, NoticeBean t1) {
|
|
|
+ return noticeBean.getOpeningDate().compareTo(t1.getOpeningDate());
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
+ Collections.reverse(displayedList);
|
|
|
+
|
|
|
return displayedList;
|
|
|
}
|
|
|
|
|
|
@@ -120,17 +135,17 @@ public class NotiModel extends Model implements PushMessageBroker.IPushMessageLi
|
|
|
public void loadNotification() {
|
|
|
disposable =
|
|
|
new APINoticeModule().call(new RequestBean(), new APIModuleListener<NoticeResultBean>() {
|
|
|
- @Override
|
|
|
- public void onApiStart() {
|
|
|
- waiterCaller.showWaiter(0);
|
|
|
- }
|
|
|
+ @Override
|
|
|
+ public void onApiStart() {
|
|
|
+ waiterCaller.showWaiter(0);
|
|
|
+ }
|
|
|
|
|
|
- @Override
|
|
|
- public void onApiEnd() {
|
|
|
- waiterCaller.hideWaiter();
|
|
|
- }
|
|
|
+ @Override
|
|
|
+ public void onApiEnd() {
|
|
|
+ waiterCaller.hideWaiter();
|
|
|
+ }
|
|
|
|
|
|
- @Override
|
|
|
+ @Override
|
|
|
public void onApiSuccess(NoticeResultBean resultBean) {
|
|
|
noticeBeans = resultBean.getData();
|
|
|
|