[컨텐츠][New] 네이티브로 전환, 기존 컨텐츠는 contents_web 으로 수정

app/src/main/AndroidManifest.xml

@@ -74,7 +74,7 @@
       android:windowSoftInputMode="adjustResize">
     </activity>
     <activity
-      android:name=".lifeplus.activity.ContentsNativeActivity"
+      android:name=".lifeplus.activity.ContentsWebActivity"
       android:screenOrientation="portrait"
       android:windowSoftInputMode="adjustResize">
     </activity>

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

@@ -9,7 +9,6 @@ import kr.co.zumo.app.lifeplus.bean.ContentsDeliveryBean;
 import kr.co.zumo.app.lifeplus.helper.DeliveryHelper;
 import kr.co.zumo.app.lifeplus.supervisor.ActivityDeliveryHelper;
 import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
-import kr.co.zumo.app.lifeplus.util.AppUtil;
 
 /**
  * ContentsActivity
@@ -34,12 +33,7 @@ public class ContentsActivity extends ActivityBase {
     ActivityDeliveryHelper.getInstance().clearPackaging();
 
     // 첫 화면 표시
-    if (AppUtil.isSandbox()) {
-      launchScreen(ScreenID.CONTENTS_NATIVE);
-    }
-    else {
-      launchScreen(ScreenID.CONTENTS);
-    }
+    launchScreen(ScreenID.CONTENTS);
   }
 
   @Override

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

@@ -20,7 +20,7 @@ import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
  * @history 민효동   [2018. 9. 5.]   [최초 작성]
  * @since 2018. 9. 5.
  */
-public class ContentsNativeActivity extends ActivityBase {
+public class ContentsWebActivity extends ActivityBase {
 
   @Override
   protected void renderScreen() {
@@ -33,7 +33,7 @@ public class ContentsNativeActivity extends ActivityBase {
     ActivityDeliveryHelper.getInstance().clearPackaging();
 
     // 첫 화면 표시
-    launchScreen(ScreenID.CONTENTS_NATIVE);
+    launchScreen(ScreenID.CONTENTS_WEB);
   }
 
   @Override

app/src/main/java/kr/co/zumo/app/lifeplus/supervisor/ScreenID.java

@@ -89,7 +89,7 @@ public class ScreenID {
   public static final int ACTIVITY = 69;
   public static final int BUCKET_DEFAULT = 70;
   public static final int SERIES = 71;
-  public static final int CONTENTS_NATIVE = 72;
+  public static final int CONTENTS_WEB = 72;
 
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({
@@ -101,7 +101,7 @@ public class ScreenID {
     LIFE_PLUS_INTRODUCTION, LIFE_PLUS_X, SETTING_MEMBER_INFO, MY_MAIN_GUEST, COUPON_MALL, ALL_MENU_GUEST, SETTING_MEMBER_QUIT_INFO, MY_FAQ, SETTING_MEMBER_QUIT_REQUEST,
     SETTING_MEMBER_QUIT_FINISH, SETTING_TERMS, SETTING_MEMBER_QUIT_FAIL, MAIN_PIN_UNLOCK, PIN_RESET_AUTH, PIN_RESET_INPUT, PIN_RESET_AUTH_FROM_SETTING,
     PIN_RESET_INPUT_FROM_SETTING, PIN_RESET_AUTH_FROM_ALREADY_MEMBER, PIN_RESET_INPUT_FROM_ALREADY_MEMBER, CONTENTS, EVENT, PHONE_NUMBER_RESET, BUCKET_MY_EDIT, BUCKET_DEFAULT,
-    NETWORK_ERROR_STARTING, OVER_VIEW, ACTIVITY, SERIES, CONTENTS_NATIVE
+    NETWORK_ERROR_STARTING, OVER_VIEW, ACTIVITY, SERIES, CONTENTS_WEB
   })
   public @interface ID {}
 

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

@@ -9,8 +9,8 @@ import android.util.Log;
 
 import kr.co.zumo.app.lifeplus.activity.CategoryActivity;
 import kr.co.zumo.app.lifeplus.activity.ContentsActivity;
-import kr.co.zumo.app.lifeplus.activity.ContentsNativeActivity;
 import kr.co.zumo.app.lifeplus.activity.ContentsOverviewActivity;
+import kr.co.zumo.app.lifeplus.activity.ContentsWebActivity;
 import kr.co.zumo.app.lifeplus.activity.MenuActivity;
 import kr.co.zumo.app.lifeplus.bean.CategoryDeliveryBean;
 import kr.co.zumo.app.lifeplus.bean.ContentsDeliveryBean;
@@ -61,8 +61,8 @@ public class ActivityScreen extends Screen {
         setContentsPackage();
 
         break;
-      case ScreenID.CONTENTS_NATIVE:
-        intent = new Intent(context, ContentsNativeActivity.class);
+      case ScreenID.CONTENTS_WEB:
+        intent = new Intent(context, ContentsWebActivity.class);
         
         setContentsPackage();
 

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

@@ -58,7 +58,7 @@ public class ScreenManager implements IScreen {
         case ScreenID.CONTENTS:
           screen = new ActivityScreen(helper, id, direction, method);
           break;
-        case ScreenID.CONTENTS_NATIVE:
+        case ScreenID.CONTENTS_WEB:
           screen = new ActivityScreen(helper, id, direction, method);
           break;
         case ScreenID.OVER_VIEW:

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

@@ -10,8 +10,6 @@ import kr.co.zumo.app.lifeplus.helper.ActionBarHelper;
 import kr.co.zumo.app.lifeplus.helper.DeliveryHelper;
 import kr.co.zumo.app.lifeplus.model.module.APICategoryContentsLoadModule;
 import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
-import kr.co.zumo.app.lifeplus.util.AppUtil;
-import kr.co.zumo.app.lifeplus.util.StringUtil;
 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;
@@ -158,13 +156,7 @@ public abstract class CategoryMainPresenter<M extends CategoryMainModel, V exten
   }
 
   private void goContentsNativeOrWeb() {
-    // fixme remove
-    if (StringUtil.getPureVersionString(AppUtil.getVersionName()).equals("4.0.0.20")) {
-      go(ScreenID.CONTENTS_NATIVE);
-    }
-    else {
-      go(ScreenID.CONTENTS);
-    }
+    go(ScreenID.CONTENTS);
   }
 
   private void setContentsOrder(int index) {

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/contents/ContentsBasePresenter.java

@@ -34,7 +34,7 @@ import kr.co.zumo.app.lifeplus.view.dialog.ShareDialog;
 import kr.co.zumo.app.lifeplus.view.presenter.Presenter;
 
 /**
- * ContentsPresenter
+ * ContentsBasePresenter
  * <pre>
  * </pre>
  *
@@ -55,7 +55,7 @@ public abstract class ContentsBasePresenter<M extends ContentsModel, V extends I
     ContentsDeliveryBean contentsDeliveryBean = deliveryHelper.getPackaging(ContentsDeliveryBean.class);
 
     if (null != contentsDeliveryBean) {
-      Log.w("APP# ContentsBasePresenter | ContentsPresenter", "|" + contentsDeliveryBean.toPrettyJson());
+      Log.w("APP# ContentsBasePresenter | ContentsWebPresenter", "|" + contentsDeliveryBean.toPrettyJson());
       this.model.setContentsBean(contentsDeliveryBean.getContentsBean());
 
       deliveryHelper.clearPackaging();

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/contents/ContentsFragment.java

@@ -22,7 +22,7 @@ import kr.co.zumo.app.lifeplus.util.StringUtil;
 import kr.co.zumo.app.lifeplus.view.screen.FragmentBase;
 
 /**
- * ContentsFragment
+ * ContentsWebFragment
  * <pre>
  * </pre>
  *
@@ -31,15 +31,13 @@ import kr.co.zumo.app.lifeplus.view.screen.FragmentBase;
  * @history 민효동   [2018. 11. 6.]   [최초 작성]
  * @since 2018. 11. 6.
  */
-public class ContentsFragment extends FragmentBase<ContentsPresenter> implements IContentsView {
+public class ContentsWebFragment extends FragmentBase<ContentsWebPresenter> implements IContentsView {
 
   private WebView webView;
-  private View tooltip;
   private ActionBarHelper actionBarHelper;
 
   @Override
   protected View onAfterCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-    tooltip = inflater.inflate(R.layout.dialog_tool_tip, container, false);
     return inflater.inflate(R.layout.fragment_contents, container, false);
   }
 
@@ -64,8 +62,8 @@ public class ContentsFragment extends FragmentBase<ContentsPresenter> implements
   }
 
   @Override
-  protected ContentsPresenter definePresenter() {
-    return new ContentsPresenter(getModel(ContentsModel.class), this);
+  protected ContentsWebPresenter definePresenter() {
+    return new ContentsWebPresenter(getModel(ContentsModel.class), this);
   }
 
   @Override

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/contents/ContentsPresenter.java

@@ -21,7 +21,7 @@ import kr.co.zumo.app.lifeplus.view.dialog.ICustomDialogListener;
 import kr.co.zumo.app.lifeplus.view.dialog.TooltipDialog;
 
 /**
- * ContentsPresenter
+ * ContentsWebPresenter
  * <pre>
  * </pre>
  *
@@ -30,12 +30,12 @@ import kr.co.zumo.app.lifeplus.view.dialog.TooltipDialog;
  * @history 민효동   [2018. 11. 6.]   [최초 작성]
  * @since 2018. 11. 6.
  */
-public class ContentsPresenter extends ContentsBasePresenter<ContentsModel, IContentsView> {
+public class ContentsWebPresenter extends ContentsBasePresenter<ContentsModel, IContentsView> {
 
   protected DialogBase reviewDialog;
   protected Share share;
 
-  public ContentsPresenter(ContentsModel model, IContentsView view) {
+  public ContentsWebPresenter(ContentsModel model, IContentsView view) {
     super(model, view);
 
   }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/factory/BasicFragmentFactory.java

@@ -14,7 +14,7 @@ import kr.co.zumo.app.lifeplus.view.screen.category.type3.ThirdCategoryMainFragm
 import kr.co.zumo.app.lifeplus.view.screen.category.type4.FourthCategoryMainFragment;
 import kr.co.zumo.app.lifeplus.view.screen.category.type5.FifthCategoryMainFragment;
 import kr.co.zumo.app.lifeplus.view.screen.contents.ContentsDetailFragment;
-import kr.co.zumo.app.lifeplus.view.screen.contents.ContentsFragment;
+import kr.co.zumo.app.lifeplus.view.screen.contents.ContentsWebFragment;
 import kr.co.zumo.app.lifeplus.view.screen.contents.ContentsOverviewFragment;
 import kr.co.zumo.app.lifeplus.view.screen.couponmall.CouponMallFragment;
 import kr.co.zumo.app.lifeplus.view.screen.error.NetworkErrorStartingFragment;
@@ -272,11 +272,11 @@ public class BasicFragmentFactory extends FragmentFactory {
 
       // contents
       case ScreenID.CONTENTS:
-        fragment = new ContentsFragment();
-        break;
-      case ScreenID.CONTENTS_NATIVE:
         fragment = new ContentsDetailFragment();
         break;
+      case ScreenID.CONTENTS_WEB:
+        fragment = new ContentsWebFragment();
+        break;
       case ScreenID.OVER_VIEW:
         fragment = new ContentsOverviewFragment();
         break;