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

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

@@ -32,7 +32,7 @@ import kr.co.zumo.app.lifeplus.view.Event;
  * @history 민효동   [2018. 11. 6.]   [최초 작성]
  * @since 2018. 11. 6.
  */
-public class CategoryMainModel extends Model {
+public abstract class CategoryMainModel extends Model {
 
   public static final int LOADED_RECOMMEND = 0;
   public static final int LOADED_BANNER = 1;
@@ -176,6 +176,7 @@ public class CategoryMainModel extends Model {
       @Override
       public void onApiSuccess(CategoryContentsResultBean resultBean) {
         contentsBeans = resultBean.getData();
+        modifyContents(contentsBeans);
 
         onResult(new Event.Builder(Event.SUCCESS).index(LOADED_CONTENTS).build());
       }
@@ -198,4 +199,6 @@ public class CategoryMainModel extends Model {
     }
     return contentsBeans;
   }
+
+  protected abstract void modifyContents(ArrayList<CategoryContentsBean> contentsBeans);
 }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/category/type1/FirstCategoryMainModel.java

@@ -3,6 +3,9 @@
  */
 package kr.co.zumo.app.lifeplus.view.screen.category.type1;
 
+import java.util.ArrayList;
+
+import kr.co.zumo.app.lifeplus.bean.api.CategoryContentsBean;
 import kr.co.zumo.app.lifeplus.view.screen.category.CategoryMainModel;
 
 /**
@@ -44,4 +47,9 @@ public class FirstCategoryMainModel extends CategoryMainModel {
 
   }
 
+  @Override
+  protected void modifyContents(ArrayList<CategoryContentsBean> contentsBeans) {
+
+  }
+
 }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/category/type2/SecondCategoryMainModel.java

@@ -3,6 +3,10 @@
  */
 package kr.co.zumo.app.lifeplus.view.screen.category.type2;
 
+import java.util.ArrayList;
+import java.util.Collections;
+
+import kr.co.zumo.app.lifeplus.bean.api.CategoryContentsBean;
 import kr.co.zumo.app.lifeplus.view.screen.category.CategoryMainModel;
 
 /**
@@ -21,7 +25,7 @@ public class SecondCategoryMainModel extends CategoryMainModel {
   @Override
   protected void destroyInternal() {
     super.destroyInternal();
-    
+
   }
 
   @Override
@@ -44,4 +48,17 @@ public class SecondCategoryMainModel extends CategoryMainModel {
 
   }
 
+  @Override
+  protected void modifyContents(ArrayList<CategoryContentsBean> contentsBeans) {
+    // 5번 째 6번 째 데이터 교체
+    int len = contentsBeans.size();
+    int j;
+    for (int i = 0; i < len; ++i) {
+      if (i % 9 == 4) {
+        j = (i / 9) * 9;
+        Collections.swap(contentsBeans, 4 + j, 5 + j);
+      }
+    }
+  }
+
 }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/category/type3/ThirdCategoryMainModel.java

@@ -3,6 +3,9 @@
  */
 package kr.co.zumo.app.lifeplus.view.screen.category.type3;
 
+import java.util.ArrayList;
+
+import kr.co.zumo.app.lifeplus.bean.api.CategoryContentsBean;
 import kr.co.zumo.app.lifeplus.view.screen.category.CategoryMainModel;
 
 /**
@@ -44,4 +47,9 @@ public class ThirdCategoryMainModel extends CategoryMainModel {
 
   }
 
+  @Override
+  protected void modifyContents(ArrayList<CategoryContentsBean> contentsBeans) {
+
+  }
+
 }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/category/type4/FourthCategoryMainModel.java

@@ -3,6 +3,9 @@
  */
 package kr.co.zumo.app.lifeplus.view.screen.category.type4;
 
+import java.util.ArrayList;
+
+import kr.co.zumo.app.lifeplus.bean.api.CategoryContentsBean;
 import kr.co.zumo.app.lifeplus.view.screen.category.CategoryMainModel;
 
 /**
@@ -44,4 +47,9 @@ public class FourthCategoryMainModel extends CategoryMainModel {
 
   }
 
+  @Override
+  protected void modifyContents(ArrayList<CategoryContentsBean> contentsBeans) {
+
+  }
+
 }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/category/type5/FifthCategoryMainModel.java

@@ -3,9 +3,11 @@
  */
 package kr.co.zumo.app.lifeplus.view.screen.category.type5;
 
+import java.util.ArrayList;
 import java.util.Calendar;
 
 import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.bean.api.CategoryContentsBean;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.view.screen.category.CategoryMainModel;
 
@@ -48,6 +50,11 @@ public class FifthCategoryMainModel extends CategoryMainModel {
 
   }
 
+  @Override
+  protected void modifyContents(ArrayList<CategoryContentsBean> contentsBeans) {
+
+  }
+
   public String getMonthWeekString() {
     return ResourceUtil.getString(R.string.month_week, getMonth() + 1, getWeekOfMonth());
   }