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

app/src/main/AndroidManifest.xml

@@ -78,11 +78,18 @@
       android:windowSoftInputMode="adjustResize">
     </activity>
 
+    <activity
+      android:name=".lifeplus.activity.SeriesActivity"
+      android:screenOrientation="portrait"
+      android:windowSoftInputMode="adjustResize">
+    </activity>
+
     <activity
       android:name=".lifeplus.activity.ContentsActivity"
       android:screenOrientation="portrait"
       android:windowSoftInputMode="adjustResize">
     </activity>
+
     <activity
       android:name=".lifeplus.activity.ContentsWebActivity"
       android:screenOrientation="portrait"

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

@@ -0,0 +1,41 @@
+package kr.co.zumo.app.lifeplus.activity;
+
+import android.content.Intent;
+
+import kr.co.zumo.app.lifeplus.helper.DeliveryHelper;
+import kr.co.zumo.app.lifeplus.supervisor.ActivityDeliveryHelper;
+import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
+
+/**
+ * SeriesActivity
+ * <pre>
+ * </pre>
+ *
+ * @author 하세미
+ * @version 1.0
+ * @history 하세미   [2018-12-10]   [최초 작성]
+ * @since 2018-12-10
+ */
+public class SeriesActivity extends ActivityBaseScreen {
+
+  @Override
+  protected void render() {
+    ActivityDeliveryHelper.getInstance().shipTo(getHelper(DeliveryHelper.class));
+    launchScreen(ScreenID.SERIES);
+  }
+
+  @Override
+  protected void onAfterDestroy() {
+
+  }
+
+  @Override
+  protected void onBeforeDestroy() {
+
+  }
+
+  @Override
+  protected void onAfterNewIntent(Intent intent) {
+
+  }
+}

app/src/main/java/kr/co/zumo/app/lifeplus/supervisor/screen/ActivityScreen.java

@@ -17,6 +17,7 @@ import kr.co.zumo.app.lifeplus.activity.FAQActivity;
 import kr.co.zumo.app.lifeplus.activity.MenuActivity;
 import kr.co.zumo.app.lifeplus.activity.MyCoinActivity;
 import kr.co.zumo.app.lifeplus.activity.NotiActivity;
+import kr.co.zumo.app.lifeplus.activity.SeriesActivity;
 import kr.co.zumo.app.lifeplus.activity.SignUpActivity;
 import kr.co.zumo.app.lifeplus.activity.WebActivity;
 import kr.co.zumo.app.lifeplus.bean.CategoryDeliveryBean;
@@ -61,6 +62,11 @@ public class ActivityScreen extends Screen {
         intent = new Intent(activity, MenuActivity.class);
         break;
 
+      case ScreenID.SERIES:
+        intent = new Intent(activity, SeriesActivity.class);
+        shipToActivity();
+        break;
+
       case ScreenID.CONTENTS:
         intent = new Intent(activity, ContentsActivity.class);
         shipToActivity();

app/src/main/java/kr/co/zumo/app/lifeplus/supervisor/screen/ScreenManager.java

@@ -70,6 +70,9 @@ public class ScreenManager implements IScreen {
         case ScreenID.ALL_MENU:
           screen = new ActivityScreen(helper, id, direction, method);
           break;
+        case ScreenID.SERIES:
+          screen = new ActivityScreen(helper, id, direction, method);
+          break;
         case ScreenID.CONTENTS:
           screen = new ActivityScreen(helper, id, direction, method);
           break;

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

@@ -160,7 +160,6 @@ public class FirstCategoryMainFragment extends FragmentBase<FirstCategoryMainPre
       public void onNothingSelected(AdapterView<?> parent) {}
     });
 
-
   }
 
   @Override