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

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

@@ -52,14 +52,7 @@ public class ThirdCategoryMainFragment extends FragmentBase<ThirdCategoryMainPre
   protected void onAfterActivityCreated(Bundle savedInstanceState) {
     mainSeriesView = findViewById(R.id.series_image_text_view);
     recyclerViewThirdCategoryMain = findViewById(R.id.recycler_view_third_category_main);
-    doDataSetting();
-//    mainSeriesView.init(getActivity(), textImageBeanList, 10);
-    MainSeriesPresenter mainSeriesPresenter = new MainSeriesPresenter(mainSeriesView, new IMainSeriesContract.Listener() {
-      @Override
-      public void onClickItem(int position) {
-        Log.i("APP# FirstCategoryMainFragment | onClickItem", "|" + "position: " + position);
-      }
-    });
+
     ThirdCategoryMainAdapter thirdCategoryMainAdapter = new ThirdCategoryMainAdapter(getActivity());
     GridLayoutManager gridLayoutManager = new GridLayoutManager(getActivity(), 2);
     gridLayoutManager.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() {
@@ -118,21 +111,6 @@ public class ThirdCategoryMainFragment extends FragmentBase<ThirdCategoryMainPre
     return false;
   }
 
-  public void doDataSetting() {
-    textImageBeanList = new ArrayList<>();
-    textImageBeanList.add(new TextImageBean(R.drawable.img_select_bg_1, R.string.my_coin));
-    textImageBeanList.add(new TextImageBean(R.drawable.img_select_bg_2, R.string.my_coin));
-    textImageBeanList.add(new TextImageBean(R.drawable.img_select_bg_3, R.string.my_coin));
-    textImageBeanList.add(new TextImageBean(R.drawable.img_select_bg_4, R.string.my_coin));
-    textImageBeanList.add(new TextImageBean(R.drawable.img_select_bg_5, R.string.my_coin));
-    textImageBeanList.add(new TextImageBean(R.drawable.img_select_bg_6, R.string.my_coin));
-    textImageBeanList.add(new TextImageBean(R.drawable.img_select_bg_7, R.string.my_coin));
-    textImageBeanList.add(new TextImageBean(R.drawable.img_select_bg_8, R.string.my_coin));
-    textImageBeanList.add(new TextImageBean(R.drawable.img_select_bg_9, R.string.my_coin));
-    textImageBeanList.add(new TextImageBean(R.drawable.img_select_bg_10, R.string.my_coin));
-
-  }
-
   @Override
   public void drawBanner(ArrayList<CategoryBannerBean> beans) {
 
@@ -140,6 +118,12 @@ public class ThirdCategoryMainFragment extends FragmentBase<ThirdCategoryMainPre
 
   @Override
   public void drawRecommend(ArrayList<CategoryRecommendBean> beans) {
-
+    mainSeriesView.init(getActivity(), beans, beans.size());
+    MainSeriesPresenter mainSeriesPresenter = new MainSeriesPresenter(mainSeriesView, new IMainSeriesContract.Listener() {
+      @Override
+      public void onClickItem(int position) {
+        Log.i("APP# FirstCategoryMainFragment | onClickItem", "|" + "position: " + position);
+      }
+    });
   }
 }

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

@@ -3,6 +3,7 @@ package kr.co.zumo.app.lifeplus.view.screen.main.category;
 import android.support.v7.app.ActionBar;
 
 import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
+import kr.co.zumo.app.lifeplus.view.DoubleChecker;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.presenter.Presenter;
 
@@ -18,8 +19,19 @@ import kr.co.zumo.app.lifeplus.view.presenter.Presenter;
  */
 public class ThirdCategoryMainPresenter extends Presenter<ThirdCategoryMainModel, IThirdCategoryMainView> {
 
+  private DoubleChecker doubleChecker;
+
   public ThirdCategoryMainPresenter(ThirdCategoryMainModel model, IThirdCategoryMainView view) {
     super(model, view);
+    doubleChecker = new DoubleChecker(this::render);
+    init();
+  }
+
+  private void render(){view.drawRecommend(model.getRecommendBeans());}
+
+  private void init(){
+    String categoryNumber = "3";
+    model.loadRecommendContents(categoryNumber);
   }
 
   @Override
@@ -60,7 +72,14 @@ public class ThirdCategoryMainPresenter extends Presenter<ThirdCategoryMainModel
 
   @Override
   public void onResult(Event event) {
-
+    switch (event.getEventId()) {
+      case Event.SUCCESS:
+        // recommend loading complete
+        doubleChecker.checkSecond();
+        break;
+      default:
+        break;
+    }
   }
 
   @Override
@@ -89,6 +108,6 @@ public class ThirdCategoryMainPresenter extends Presenter<ThirdCategoryMainModel
 
   @Override
   public void onScreenReady() {
-
+    doubleChecker.checkFirst();
   }
 }

app/src/main/res/layout/image_and_text_contents.xml

@@ -2,6 +2,7 @@
 <LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="wrap_content"
   android:layout_height="wrap_content"
   android:gravity="center"
@@ -19,13 +20,15 @@
 
   <TextView
     android:id="@+id/text_view_main_contents"
-    android:layout_width="wrap_content"
+    android:layout_width="68dp"
     android:layout_height="wrap_content"
     android:layout_marginTop="13dp"
     android:gravity="center_horizontal"
     android:lineSpacingExtra="4sp"
-    android:text="카페 거리
-걷기"
+    android:maxLines="2"
+    android:ellipsize="end"
+    tools:text="카페 거리
+걷기 OOOOOOOOOOOOOOOOOOOO"
     android:textColor="@color/C000000"
     android:textSize="11sp"
     />