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

app/src/main/AndroidManifest.xml

@@ -105,6 +105,12 @@
       android:windowSoftInputMode="adjustResize">
     </activity>
 
+    <activity
+      android:name=".lifeplus.activity.MyCoinActivity"
+      android:screenOrientation="portrait"
+      android:windowSoftInputMode="adjustResize">
+    </activity>
+
     <activity
       android:name="com.facebook.FacebookActivity"
       android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"

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

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

app/src/main/java/kr/co/zumo/app/lifeplus/bean/api/LifeplusContentsBean.java

@@ -124,7 +124,7 @@ public class LifeplusContentsBean extends JsonBeanBase {
    * @return
    */
   public String getContentsUrlWithParam() {
-    return contentsUrl + "?itemNo=" + itemNumber + "&headerVisible=n";
+    return contentsUrl + "?itemNo=" + itemNumber;
   }
 
   /**
@@ -134,7 +134,7 @@ public class LifeplusContentsBean extends JsonBeanBase {
    * @return
    */
   public String getContentsUrlWithParamForShare(int pageIndex) {
-    return contentsUrl + "?itemNo=" + itemNumber + "&headerVisible=y" + "&visiblePage=" + String.valueOf(pageIndex);
+    return contentsUrl + "?itemNo=" + itemNumber + "&visiblePage=" + String.valueOf(pageIndex);
   }
 
   /**

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

@@ -11,8 +11,10 @@ import kr.co.zumo.app.lifeplus.activity.CategoryActivity;
 import kr.co.zumo.app.lifeplus.activity.ContentsActivity;
 import kr.co.zumo.app.lifeplus.activity.ContentsOverviewActivity;
 import kr.co.zumo.app.lifeplus.activity.ContentsWebActivity;
+import kr.co.zumo.app.lifeplus.activity.CoopActivity;
 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.SignUpActivity;
 import kr.co.zumo.app.lifeplus.bean.CategoryDeliveryBean;
 import kr.co.zumo.app.lifeplus.bean.ContentsDeliveryBean;
@@ -20,7 +22,6 @@ import kr.co.zumo.app.lifeplus.helper.DeliveryHelper;
 import kr.co.zumo.app.lifeplus.helper.ScreenManagerHelper;
 import kr.co.zumo.app.lifeplus.supervisor.ActivityDeliveryHelper;
 import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
-import kr.co.zumo.app.lifeplus.view.Event;
 
 /**
  * ActivityScreen
@@ -53,32 +54,27 @@ public class ActivityScreen extends Screen {
       case ScreenID.FIFTH_CATEGORY:
         intent = new Intent(activity, CategoryActivity.class);
         ActivityDeliveryHelper.getInstance().setPackaging(new CategoryDeliveryBean(id));
-
         break;
       case ScreenID.ALL_MENU:
 //        type = ActivityBase.SLIDE_TYPE_DIALOG;
         intent = new Intent(activity, MenuActivity.class);
-
         break;
       case ScreenID.CONTENTS:
         intent = new Intent(activity, ContentsActivity.class);
-
         setContentsPackage();
-
         break;
       case ScreenID.CONTENTS_WEB:
         intent = new Intent(activity, ContentsWebActivity.class);
-
         setContentsPackage();
-
         break;
       case ScreenID.FAQ:
         intent = new Intent(activity, FAQActivity.class);
-
         break;
-
-      case Event.COUPON_MALL:
-        intent = new Intent(activity, FAQActivity.class);
+      case ScreenID.COUPON_MALL:
+        intent = new Intent(activity, CoopActivity.class);
+        break;
+      case ScreenID.MY_COIN_MAIN:
+        intent = new Intent(activity, MyCoinActivity.class);
         break;
       case ScreenID.OVER_VIEW:
         intent = new Intent(activity, ContentsOverviewActivity.class);

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

@@ -5,7 +5,6 @@ package kr.co.zumo.app.lifeplus.supervisor.screen;
 
 import kr.co.zumo.app.lifeplus.helper.ScreenManagerHelper;
 import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
-import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.command.HomeCommand;
 import kr.co.zumo.app.lifeplus.view.presenter.CommandInvoker;
 
@@ -53,7 +52,10 @@ public class ScreenManager implements IScreen {
         case ScreenID.FAQ:
           screen = new ActivityScreen(helper, id, direction, method);
           break;
-        case Event.COUPON_MALL:
+        case ScreenID.COUPON_MALL:
+          screen = new ActivityScreen(helper, id, direction, method);
+          break;
+        case ScreenID.MY_COIN_MAIN:
           screen = new ActivityScreen(helper, id, direction, method);
           break;
         case ScreenID.MAIN:

app/src/main/java/kr/co/zumo/app/lifeplus/view/presenter/Presenter.java

@@ -270,20 +270,20 @@ public abstract class Presenter<M extends Model, V extends IView> implements ILi
     }
   }
 
-  protected void go(@IntRange(from = 0, to = 1000) int id, @ScreenID.Direction int direction, @Screen.Method int method) {
+  protected void go(@ScreenID.ID @IntRange(from = 0, to = 1000) int id, @ScreenID.Direction int direction, @Screen.Method int method) {
     onCommand(new ScreenCommand(id, direction, method));
 
   }
 
-  protected void go(@IntRange(from = 0, to = 1000) int id) {
+  protected void go(@ScreenID.ID @IntRange(from = 0, to = 1000) int id) {
     go(id, ScreenID.DIRECTION_NEXT);
   }
 
-  protected void go(@IntRange(from = 0, to = 1000) int id, @ScreenID.Direction int direction) {
+  protected void go(@ScreenID.ID @IntRange(from = 0, to = 1000) int id, @ScreenID.Direction int direction) {
     go(id, direction, Screen.METHOD_SKIP);
   }
 
-  protected void back(@IntRange(from = 0, to = 1000) int id) {
+  protected void back(@ScreenID.ID @IntRange(from = 0, to = 1000) int id) {
     go(id, ScreenID.DIRECTION_BACK, Screen.METHOD_SKIP);
   }
 
@@ -292,7 +292,7 @@ public abstract class Presenter<M extends Model, V extends IView> implements ILi
    *
    * @param id
    */
-  protected void jump(@IntRange(from = 0, to = 1000) int id) {
+  protected void jump(@ScreenID.ID @IntRange(from = 0, to = 1000) int id) {
     go(id, ScreenID.DIRECTION_BACK, Screen.METHOD_JUMP);
   }
 

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

@@ -109,6 +109,7 @@ public class AllMenuPresenter extends Presenter<AllMenuModel, IView> {
         break;
       case Event.COUPON_MALL:
         if (AppUtil.isDebug()) {
+          finish();
           go(ScreenID.COUPON_MALL);
         }
         else {