Merge branch 'develop' of https://github.com/swict/LifeplusAndroid into develop

app/src/main/java/kr/co/zumo/app/lifeplus/activity/AppInitializer.java

@@ -14,6 +14,7 @@ import kr.co.zumo.app.lifeplus.supervisor.ActivityDeliveryResultHelper;
 import kr.co.zumo.app.lifeplus.supervisor.ActivityScreenIDDeliveryHelper;
 import kr.co.zumo.app.lifeplus.supervisor.AnimatorManager;
 import kr.co.zumo.app.lifeplus.supervisor.ContentsFlagHelper;
+import kr.co.zumo.app.lifeplus.view.screen.main.SystemPopupManager;
 import kr.co.zumo.app.lifeplus.view.screen.my.bookmark.BookmarkManager;
 import kr.co.zumo.app.lifeplus.view.screen.my.bucketlist.BucketListManager;
 import kr.co.zumo.app.lifeplus.view.screen.my.coin.CoinModelHelper;
@@ -68,9 +69,10 @@ public class AppInitializer {
     AnimatorManager.getInstance().dispose();
     PushMessageBroker.getInstance().dispose();
     FirebaseHelper.getInstance().dispose();
-    CoinModelHelper.getInstance().dispose();
     BucketListManager.getInstance().dispose();
     BookmarkManager.getInstance().dispose();
+    SystemPopupManager.getInstance().dispose();
+    CoinModelHelper.getInstance().dispose();
     SignUpModelHelper.getInstance().dispose();
 
     ActivityDeliveryHelper.getInstance().dispose();

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/main/MainModel.java

@@ -19,7 +19,6 @@ import android.util.Log;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
 import java.util.concurrent.TimeUnit;
@@ -183,21 +182,7 @@ public class MainModel extends Model {
           //정렬 추가
           if (null != popupInfoListBean) {
             promotionPopupBeans = popupInfoListBean.getPromotionPopupList();
-
-            if (null != promotionPopupBeans) {
-              Collections.sort(promotionPopupBeans, new Comparator<PromotionPopupBean>() {
-                @Override
-                public int compare(PromotionPopupBean promotionPopupBean, PromotionPopupBean t1) {
-                  if (Integer.parseInt(promotionPopupBean.getOrderSeqNo()) < Integer.parseInt(t1.getOrderSeqNo())) {
-                    return -1;
-                  }
-                  else if (Integer.parseInt(promotionPopupBean.getOrderSeqNo()) > Integer.parseInt(t1.getOrderSeqNo())) {
-                    return 1;
-                  }
-                  return 0;
-                }
-              });
-            }
+            sortPopupList(promotionPopupBeans);
 
             SystemPopupManager.getInstance().setSystemPopupBeans(popupInfoListBean.getSystemPopupList());
           }
@@ -218,11 +203,26 @@ public class MainModel extends Model {
     else {
       SystemPopupManager.getInstance().setAvailableRefresh();
       promotionPopupBeans = SystemPopupManager.getInstance().getPromotionPopupBeans();
+      sortPopupList(promotionPopupBeans);
       onResult(new Event.Builder(Event.SUCCESS).integer(Event.LOADED_POPUP_INFO).build());
     }
 
   }
 
+  private void sortPopupList(List<PromotionPopupBean> beans) {
+    if (null != beans) {
+      Collections.sort(beans, (promotionPopupBean, t1) -> {
+        if (Integer.parseInt(promotionPopupBean.getOrderSeqNo()) < Integer.parseInt(t1.getOrderSeqNo())) {
+          return -1;
+        }
+        else if (Integer.parseInt(promotionPopupBean.getOrderSeqNo()) > Integer.parseInt(t1.getOrderSeqNo())) {
+          return 1;
+        }
+        return 0;
+      });
+    }
+  }
+
   private List<PromotionPopupBean> promotionPopupBeans;
 
   public List<PromotionPopupBean> getPromotionPopupBeans() {

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/main/SystemPopupManager.java

@@ -138,4 +138,13 @@ public class SystemPopupManager {
   public SystemPopupBean getMatchedBean() {
     return matchedBean;
   }
+
+  /**
+   * dispose
+   */
+  public void dispose() {
+    systemPopupBeans = null;
+    promotionPopupBeans = null;
+    matchedBean = null;
+  }
 }