Browse Source

[콘텐츠상세][Common] map activity 분리

Hasemi 7 years ago
parent
commit
dc1d64f790

+ 7 - 1
app/src/main/AndroidManifest.xml

@@ -16,9 +16,9 @@
     android:allowBackup="false"
     android:icon="@mipmap/ic_launcher"
     android:label="${appLabel}"
+    android:largeHeap="true"
     android:roundIcon="@mipmap/ic_launcher_round"
     android:supportsRtl="true"
-    android:largeHeap="true"
     android:theme="@style/AppTheme">
 
     <activity
@@ -143,6 +143,12 @@
       android:screenOrientation="portrait"
       android:windowSoftInputMode="adjustResize">
     </activity>
+    
+    <activity
+      android:name=".lifeplus.activity.MapActivity"
+      android:screenOrientation="portrait"
+      android:windowSoftInputMode="adjustResize">
+    </activity>
 
     <activity
       android:name="com.facebook.FacebookActivity"

+ 41 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/activity/MapActivity.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;
+
+/**
+ * MapActivity
+ * <pre>
+ * </pre>
+ *
+ * @author 하세미
+ * @version 1.0
+ * @history 하세미   [2018-12-20]   [최초 작성]
+ * @since 2018-12-20
+ */
+public class MapActivity extends ActivityBaseScreen {
+
+  @Override
+  protected void render() {
+    ActivityDeliveryHelper.getInstance().shipTo(getHelper(DeliveryHelper.class));
+    launchScreen(ScreenID.MAP);
+  }
+
+  @Override
+  protected void onAfterDestroy() {
+
+  }
+
+  @Override
+  protected void onBeforeDestroy() {
+
+  }
+
+  @Override
+  protected void onAfterNewIntent(Intent intent) {
+
+  }
+}

+ 2 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/supervisor/ScreenID.java

@@ -93,6 +93,7 @@ public class ScreenID {
   public static final int CONTENTS_WEB = 72;
   public static final int WEB = 73;
   public static final int BUCKET_ACTIVITY = 74;
+  public static final int MAP = 75;
 
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({
@@ -104,7 +105,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_DETAIL,
-    NETWORK_ERROR_STARTING, OVER_VIEW, ACTIVITY, SERIES, CONTENTS_WEB, SIGN_UP_START_FROM_ZUMO_ON_BOARDING, WEB, BUCKET_ACTIVITY
+    NETWORK_ERROR_STARTING, OVER_VIEW, ACTIVITY, SERIES, CONTENTS_WEB, SIGN_UP_START_FROM_ZUMO_ON_BOARDING, WEB, BUCKET_ACTIVITY, MAP
   })
   public @interface ID {}
 

+ 5 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/supervisor/screen/ActivityScreen.java

@@ -15,6 +15,7 @@ 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.IntroductionActivity;
+import kr.co.zumo.app.lifeplus.activity.MapActivity;
 import kr.co.zumo.app.lifeplus.activity.MenuActivity;
 import kr.co.zumo.app.lifeplus.activity.MyCoinActivity;
 import kr.co.zumo.app.lifeplus.activity.NotiActivity;
@@ -135,7 +136,10 @@ public class ActivityScreen extends Screen {
         intent = new Intent(activity, IntroductionActivity.class);
         shipToActivity();
         break;
-
+      case ScreenID.MAP:
+        intent = new Intent(activity, MapActivity.class);
+        shipToActivity();
+        break;
       default:
         Log.w("APP# ActivityScreen | change", "|" + "activity id bad...");
         break;

+ 3 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/supervisor/screen/ScreenManager.java

@@ -55,6 +55,9 @@ public class ScreenManager implements IScreen {
         case ScreenID.WEB:
           screen = new ActivityScreen(helper, id, direction, method);
           break;
+        case ScreenID.MAP:
+          screen = new ActivityScreen(helper, id, direction, method);
+          break;
         case ScreenID.FAQ:
           screen = new ActivityScreen(helper, id, direction, method);
           break;

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

@@ -475,7 +475,7 @@ public class ContentsPresenter extends ContentsBasePresenter<ContentsModel, ICon
                 break;
               case Event.ADDRESS:
                 model.setDeliveryPackaging(event.getString());
-                go(ScreenID.WEB);
+                go(ScreenID.MAP);
                 break;
               default:
                 break;

+ 61 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/contents/MapFragment.java

@@ -0,0 +1,61 @@
+package kr.co.zumo.app.lifeplus.view.screen.contents;
+
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.helper.ActionBarHelper;
+import kr.co.zumo.app.lifeplus.model.BlankModel;
+import kr.co.zumo.app.lifeplus.view.screen.FragmentBase;
+import kr.co.zumo.app.lifeplus.view.screen.member.MemberBlockPresenter;
+
+/**
+ * MapFragment
+ * <pre>
+ * </pre>
+ *
+ * @author 하세미
+ * @version 1.0
+ * @history 하세미   [2018-12-20]   [최초 작성]
+ * @since 2018-12-20
+ */
+public class MapFragment extends FragmentBase<MapPresenter> {
+  @Override
+  protected View onAfterCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+    return inflater.inflate(R.layout.fragment_map, container, false);
+  }
+
+  @Override
+  protected void onAfterActivityCreated(Bundle savedInstanceState) {
+
+  }
+
+  @Override
+  protected void defineActionBar(ActionBarHelper actionBarHelper) {
+
+  }
+
+  @Override
+  protected MapPresenter definePresenter() {
+    return new MapPresenter(getModel(BlankModel.class), this);
+  }
+
+  @Override
+  protected void onAfterDestroyView() {
+
+  }
+
+  @Override
+  protected void onAfterDestroy() {
+
+  }
+
+  @Override
+  protected boolean isSkipScreenWhenBack() {
+    return false;
+  }
+}

+ 84 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/contents/MapPresenter.java

@@ -0,0 +1,84 @@
+package kr.co.zumo.app.lifeplus.view.screen.contents;
+
+import kr.co.zumo.app.lifeplus.model.BlankModel;
+import kr.co.zumo.app.lifeplus.view.Event;
+import kr.co.zumo.app.lifeplus.view.IView;
+import kr.co.zumo.app.lifeplus.view.presenter.Presenter;
+
+/**
+ * MapPresenter
+ * <pre>
+ * </pre>
+ *
+ * @author 하세미
+ * @version 1.0
+ * @history 하세미   [2018-12-20]   [최초 작성]
+ * @since 2018-12-20
+ */
+public class MapPresenter extends Presenter<BlankModel, IView> {
+
+
+  public MapPresenter(BlankModel model, IView view) {
+    super(model, view);
+  }
+
+  @Override
+  protected void createViewInternal() {
+
+  }
+
+  @Override
+  protected void destroyInternal() {
+
+  }
+
+  @Override
+  protected void destroyViewInternal() {
+
+  }
+
+  @Override
+  protected void startInternal() {
+
+  }
+
+  @Override
+  protected void startInternalOnce() {
+
+  }
+
+  @Override
+  protected void stopInternal() {
+
+  }
+
+  @Override
+  protected void resumeInternal() {
+
+  }
+
+  @Override
+  protected void pauseInternal() {
+
+  }
+
+  @Override
+  public boolean onBackPressed() {
+    return false;
+  }
+
+  @Override
+  protected void onEventInternal(Event event) {
+
+  }
+
+  @Override
+  public void onScreenReady() {
+
+  }
+
+  @Override
+  public void onResult(Event event) {
+
+  }
+}

+ 4 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/factory/BasicFragmentFactory.java

@@ -15,6 +15,7 @@ import kr.co.zumo.app.lifeplus.view.screen.category.type5.FifthCategoryMainFragm
 import kr.co.zumo.app.lifeplus.view.screen.contents.ContentsFragment;
 import kr.co.zumo.app.lifeplus.view.screen.contents.ContentsOverviewFragment;
 import kr.co.zumo.app.lifeplus.view.screen.contents.ContentsWebFragment;
+import kr.co.zumo.app.lifeplus.view.screen.contents.MapFragment;
 import kr.co.zumo.app.lifeplus.view.screen.contents.series.ContentsSeriesFragment;
 import kr.co.zumo.app.lifeplus.view.screen.couponmall.CouponMallFragment;
 import kr.co.zumo.app.lifeplus.view.screen.error.NetworkErrorStartingFragment;
@@ -289,6 +290,9 @@ public class BasicFragmentFactory extends FragmentFactory {
       case ScreenID.SERIES:
         fragment = new ContentsSeriesFragment();
         break;
+      case ScreenID.MAP:
+        fragment = new MapFragment();
+        break;
       case ScreenID.WEB:
         fragment = new WebFragment();
         break;

+ 6 - 0
app/src/main/res/layout/fragment_map.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                                             android:layout_width="match_parent"
+                                             android:layout_height="match_parent">
+
+</android.support.constraint.ConstraintLayout>