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

# Conflicts:
#	app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/main/category/FirstCategoryMainFragment.java

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

@@ -36,7 +36,7 @@ import kr.co.zumo.app.lifeplus.view.screen.FragmentBase;
  * @history 하세미   [2018-10-22]   [최초 작성]
  * @since 2018-10-22
  */
-public class FirstCategoryMainFragment extends FragmentBase<FirstCategoryMainPresenter> implements IFirstCategoryMainView{
+public class FirstCategoryMainFragment extends FragmentBase<FirstCategoryMainPresenter> implements IFirstCategoryMainView {
 
   private MainSeriesView mainSeriesView;
   private RecyclerView recyclerViewFirstCategoryMain;
@@ -130,4 +130,9 @@ public class FirstCategoryMainFragment extends FragmentBase<FirstCategoryMainPre
       }
     });
   }
+
+  @Override
+  public void hideRecommendArea() {
+    mainSeriesView.setVisibility(View.GONE);
+  }
 }

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

@@ -37,12 +37,15 @@ public class FirstCategoryMainPresenter extends Presenter<FirstCategoryMainModel
     super(model, view);
 
     doubleChecker = new DoubleChecker(this::render);
-
     init();
   }
 
   private void render() {
-    view.drawRecommend(model.getRecommendBeans());
+    if(model.getRecommendBeans().size() == 0){
+      view.hideRecommendArea();
+    }else{
+      view.drawRecommend(model.getRecommendBeans());
+    }
   }
 
   private void init() {
@@ -162,6 +165,7 @@ public class FirstCategoryMainPresenter extends Presenter<FirstCategoryMainModel
         break;
       case Event.ERROR:
         showErrorDialog(event.getString());
+        view.hideRecommendArea();
         break;
       default:
         break;

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

@@ -14,4 +14,5 @@ package kr.co.zumo.app.lifeplus.view.screen.main.category;
  * @since 2018. 11. 6.
  */
 public interface IFirstCategoryMainView extends ICategoryMainView {
+  void hideRecommendArea();
 }

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

@@ -77,6 +77,9 @@ public class ThirdCategoryMainPresenter extends Presenter<ThirdCategoryMainModel
         // recommend loading complete
         doubleChecker.checkSecond();
         break;
+      case Event.ERROR:
+        showErrorDialog(event.getString());
+        break;
       default:
         break;
     }