[마이][New] screen id 삭제 - MY_MAIN, MY_MAIN_GUEST

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

@@ -26,7 +26,7 @@ public class MyMainActivity extends ActivityBaseScreen {
     // 상황에 따라서 id 를 변경해준다.
     Integer id = ActivityDeliveryHelper.getInstance().getPackaging(Integer.class);
     if (null == id) {
-      id = ScreenID.MY_MAIN;
+//      id = ScreenID.MY_MAIN;
     }
     // 첫 화면 표시
     launchScreen(id);

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

@@ -57,7 +57,7 @@ public class ScreenID {
   public static final int FIFTH_CATEGORY = 35;
   public static final int NOTIFICATION = 36;
   public static final int SETTING_CODE = 37;
-  public static final int MY_MAIN = 38;
+  //  public static final int MY_MAIN = 38;
   public static final int BOOK_MARK_DEFAULT = 39;
   public static final int BOOK_MARK_LIST = 40;
   public static final int MY_COIN_MAIN = 41;
@@ -66,7 +66,7 @@ public class ScreenID {
   public static final int LIFE_PLUS_INTRODUCTION = 44;
   public static final int LIFE_PLUS_X = 45;
   public static final int SETTING_MEMBER_INFO = 46;
-  public static final int MY_MAIN_GUEST = 1047;
+  //  public static final int MY_MAIN_GUEST = 1047;
   public static final int COUPON_MALL = 48;
   public static final int ALL_MENU_GUEST = 1049;
   public static final int SETTING_MEMBER_QUIT_INFO = 50;
@@ -119,16 +119,17 @@ public class ScreenID {
 
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({BACK, MAIN, SETTING, FAQ, NETWORK_ERROR, PIN, PIN_RESET, SIGN_UP_START_FROM_ZUMO, ON_BOARDING, PERMISSION_INFO,
+//    PIN_RESET_AUTH_FROM_ALREADY_MEMBER, PIN_RESET_INPUT_FROM_MEMBER_BLOCK, MY_MAIN, MY_MAIN_GUEST,
     SIGN_UP_START, SIGN_UP_MOBILE_AUTHORIZATION, SIGN_UP_ALREADY_MEMBER, SIGN_UP_NEED_FOR_30DAYS, SIGN_UP_PIN, SIGN_UP_AGREE,
     SIGN_UP_COMPLETED, SIGN_UP_UNDER_14_YEARS, REST_MEMBER_START, REST_MEMBER_ACTIVE_COMPLETED, MEMBER_BLOCK, SIGN_UP_START_FROM_ON_BOARDING,
     BUCKET_BEST, MY_COIN_DETAIL, MY_BUCKET_LIST, ADD_MY_BUCKET, FAQ_WRITE, BUCKET_DETAIL_WITH_TAG, FIRST_CATEGORY, SECOND_CATEGORY, THIRD_CATEGORY,
-    FOURTH_CATEGORY, FIFTH_CATEGORY, NOTIFICATION, SETTING_CODE, MY_MAIN, BOOK_MARK_DEFAULT, BOOK_MARK_LIST, MY_COIN_MAIN, MY_COIN_EXTINCT, MY_PURCHASE_HISTORY,
-    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,
+    FOURTH_CATEGORY, FIFTH_CATEGORY, NOTIFICATION, SETTING_CODE, BOOK_MARK_DEFAULT, BOOK_MARK_LIST, MY_COIN_MAIN, MY_COIN_EXTINCT, MY_PURCHASE_HISTORY,
+    LIFE_PLUS_INTRODUCTION, LIFE_PLUS_X, SETTING_MEMBER_INFO, 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_LIST, PHONE_NUMBER_RESET, BUCKET_MY_EDIT, BUCKET_DETAIL,
+    PIN_RESET_INPUT_FROM_SETTING, PIN_RESET_INPUT_FROM_ALREADY_MEMBER, CONTENTS, EVENT_LIST, PHONE_NUMBER_RESET, BUCKET_MY_EDIT, BUCKET_DETAIL,
     NETWORK_ERROR_STARTING, OVER_VIEW, ACTIVITY, SERIES, SIGN_UP_START_FROM_ZUMO_ON_BOARDING, WEB_FROM_CONTENTS, BUCKET_ACTIVITY, MAP, MY_EVENT, EVENT_WINNER,
     EVENT_DETAIL, SEARCH, EVENT_QUESTION, SYSTEM_CHECK, UTILITY_ACTIVITY, SEARCH_RESULT, MY_COIN_DETAIL_GUEST, PIN_RESET_AUTH_FROM_MULTI_DEVICE, PIN_RESET_INPUT_FROM_MULTI_DEVICE,
-    PIN_RESET_AUTH_FROM_MEMBER_BLOCK, /*PIN_RESET_INPUT_FROM_MEMBER_BLOCK,*/ MEMBER_UNLOCK, EVENT_DETAIL_ENTRY, EVENT_DETAIL_SELECT, EVENT_RECOMMEND, EVENT_RECOMMEND_BASIC, EVENT_RECOMMEND_TAG,
+    PIN_RESET_AUTH_FROM_MEMBER_BLOCK, MEMBER_UNLOCK, EVENT_DETAIL_ENTRY, EVENT_DETAIL_SELECT, EVENT_RECOMMEND, EVENT_RECOMMEND_BASIC, EVENT_RECOMMEND_TAG,
     EVENT_RECORD, WEB_PURCHASE, WEB_FROM_EVENT
   })
   public @interface ID {}

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

@@ -28,9 +28,7 @@ import kr.co.zumo.app.lifeplus.activity.EventWinnerActivity;
 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.MyCoinActivity;
 import kr.co.zumo.app.lifeplus.activity.MyEventActivity;
-import kr.co.zumo.app.lifeplus.activity.MyMainActivity;
 import kr.co.zumo.app.lifeplus.activity.NotiActivity;
 import kr.co.zumo.app.lifeplus.activity.SearchActivity;
 import kr.co.zumo.app.lifeplus.activity.SearchResultActivity;
@@ -161,17 +159,6 @@ public class ActivityScreen extends Screen {
         shipToActivity();
         break;
 
-      case ScreenID.MY_COIN_MAIN:// 상황에 따라서 id 를 변경해준다.
-        if (helper.getModel().isActiveMember()) {
-          id = ScreenID.MY_COIN_MAIN;
-        }
-        else {
-          id = ScreenID.MY_COIN_DETAIL_GUEST;
-        }
-        shipToActivity(id);
-        intent = new Intent(activity, MyCoinActivity.class);
-        break;
-
       case ScreenID.OVER_VIEW:
         intent = new Intent(activity, ContentsOverviewActivity.class);
         shipToActivity();
@@ -249,17 +236,28 @@ public class ActivityScreen extends Screen {
         shipToActivity();
         break;
 
-      case ScreenID.MY_MAIN:
-        intent = new Intent(activity, MyMainActivity.class);
-        // 상황에 따라서 id 를 변경해준다.
-        if (helper.getModel().isActiveMember()) {
-          id = ScreenID.MY_MAIN;
-        }
-        else {
-          id = ScreenID.MY_MAIN_GUEST;
-        }
-        shipToActivity(id);
-        break;
+//      case ScreenID.MY_COIN_MAIN:// 상황에 따라서 id 를 변경해준다.
+//        if (helper.getModel().isActiveMember()) {
+//          id = ScreenID.MY_COIN_MAIN;
+//        }
+//        else {
+//          id = ScreenID.MY_COIN_DETAIL_GUEST;
+//        }
+//        shipToActivity(id);
+//        intent = new Intent(activity, MyCoinActivity.class);
+//        break;
+
+//      case ScreenID.MY_MAIN:
+//        intent = new Intent(activity, MyMainActivity.class);
+//        // 상황에 따라서 id 를 변경해준다.
+//        if (helper.getModel().isActiveMember()) {
+//          id = ScreenID.MY_MAIN;
+//        }
+//        else {
+//          id = ScreenID.MY_MAIN_GUEST;
+//        }
+//        shipToActivity(id);
+//        break;
 
       case ScreenID.BOOK_MARK_DEFAULT:
         intent = new Intent(activity, DefaultBookMarkActivity.class);

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

@@ -71,9 +71,6 @@ public class ScreenManager implements IScreen {
         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.NOTIFICATION:
           screen = new ActivityScreen(helper, id, direction, method);
           break;
@@ -131,9 +128,12 @@ public class ScreenManager implements IScreen {
         case ScreenID.SYSTEM_CHECK:
           screen = new ActivityScreen(helper, id, direction, method);
           break;
-        case ScreenID.MY_MAIN:
-          screen = new ActivityScreen(helper, id, direction, method);
-          break;
+//        case ScreenID.MY_COIN_MAIN:
+//          screen = new ActivityScreen(helper, id, direction, method);
+//          break;
+//        case ScreenID.MY_MAIN:
+//          screen = new ActivityScreen(helper, id, direction, method);
+//          break;
         case ScreenID.BOOK_MARK_DEFAULT:
           screen = new ActivityScreen(helper, id, direction, method);
           break;

app/src/main/java/kr/co/zumo/app/lifeplus/view/Event.java

@@ -158,13 +158,14 @@ public class Event {
 
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({
+    MY_COIN_MAIN, MY_MAIN_GUEST,
     NONE, CLICK, BACK, SIGN_UP, LOGIN, CHECK, UNCHECK, JOINED, ON_BOARDING_LEFT, ON_BOARDING_RIGHT,
     RETRY, INPUT_PIN, NETWORK_CONNECTED, CHANGED, INIT, DETAIL, ERROR, UNLOCK, RESET,
     SUCCESS, FAIL, CANCEL, EMAIL_CLICK, SPECIAL_CODE_CLICK, CONFIRM, RESULT, FAQ, DELETE,
     COMPLETED, ON_BOARDING_END, EXIT, START, SETTING, BUCKET, MY_COIN_DETAIL, MY, TOGGLE, MY_BUCKET,
     ACTION_BAR_HOME, ACTION_BAR_NOTIFICATION, ACTION_BAR_SETTING, ACTION_BAR_CLOSE, ACTION_BAR_BACK,
     ACTION_BAR_SEARCH, ACTION_BAR_MENU, ACTION_BAR_TITLE, FIRST_CATEGORY, SECOND_CATEGORY, THIRD_CATEGORY, FOURTH_CATEGORY, FIFTH_CATEGORY,
-    SWITCH, BOOK_MARK_DEFAULT, BOOK_MARK_LIST, ADD, MY_COIN_MAIN, MY_PURCHASE_HISTORY, GUIDE, ADD_BUCKET, MY_MAIN_GUEST, COUPON_MALL, CATEGORY_CLICK,
+    SWITCH, BOOK_MARK_DEFAULT, BOOK_MARK_LIST, ADD, MY_PURCHASE_HISTORY, GUIDE, ADD_BUCKET, COUPON_MALL, CATEGORY_CLICK,
     MY_FAQ, UPDATE, FILTER, CLOSE, HELP, CONTENTS, MORE, BANNER, RECOMMEND, KAKAO_TALK, FACE_BOOK, CODE_COPY, EVENT, TAG, BOOKMARK, ORDER, DEFAULT, COMPLETE_BUCKET,
     LIKE, FRAGMENT_STACK_EMPTY, OVER_VIEW, SHARE, CALL_INFO, LINK, HOME_PAGE, INSTAGRAM, ADDRESS, SCROLL, SORT, TUTORIAL, CLICK_HTML, LAST, PREV, NEXT, REFRESH, MY_EVENT,
     ING_EVENT, WINNER_ANNOUNCEMENT, COUPON, TODAY, RECT, VOTE, MAIN, SEARCH, COIN, ENTRY, IMAGE, DIALOG, URI, AGREE, PUSH, NEWS, WITH_SHOWN, POINT, FOCUS, TEXT,

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

@@ -63,11 +63,12 @@ public class LinkInvoker {
         screenId = new int[]{ScreenID.EVENT_LIST, ScreenID.MY_EVENT, ScreenID.EVENT_WINNER, ScreenID.EVENT_DETAIL, ScreenID.EVENT_QUESTION, ScreenID.EVENT_DETAIL_ENTRY, ScreenID.EVENT_DETAIL_SELECT};
         break;
       case API_ID_MY_MAIN:
-        screenId = new int[]{ScreenID.MY_MAIN, ScreenID.BOOK_MARK_DEFAULT, ScreenID.BOOK_MARK_LIST, ScreenID.MY_COIN_MAIN, ScreenID.MY_COIN_EXTINCT, ScreenID.MY_PURCHASE_HISTORY, ScreenID.MY_COIN_DETAIL};
-        break;
-      case API_ID_MY_COIN_MAIN:
-        screenId = new int[]{ScreenID.MY_COIN_MAIN};
+//        screenId = new int[]{ScreenID.MY_MAIN, ScreenID.BOOK_MARK_DEFAULT, ScreenID.BOOK_MARK_LIST, ScreenID.MY_COIN_MAIN, ScreenID.MY_COIN_EXTINCT, ScreenID.MY_PURCHASE_HISTORY, ScreenID.MY_COIN_DETAIL};
+        screenId = new int[]{ScreenID.BOOK_MARK_DEFAULT, ScreenID.BOOK_MARK_LIST};
         break;
+//      case API_ID_MY_COIN_MAIN:
+//        screenId = new int[]{ScreenID.MY_COIN_MAIN};
+//        break;
       case API_ID_CATEGORY_0:
         screenId = new int[]{ScreenID.FIRST_CATEGORY};
         break;

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

@@ -207,7 +207,6 @@ public abstract class Presenter<M extends Model, V extends IView> implements ILi
    * @param event
    */
   public final void onMenuEvent(Event event) {
-
     switch (event.getEventId()) {
       case Event.FIRST_CATEGORY:
         goViaMenu(ScreenID.FIRST_CATEGORY);
@@ -513,12 +512,12 @@ public abstract class Presenter<M extends Model, V extends IView> implements ILi
          */
         UtilityActivityBean utilityActivityBean = new UtilityActivityBean();
         switch (screenId) {
-          case ScreenID.MY_MAIN:
-          case ScreenID.MY_COIN_MAIN:
-            utilityActivityBean.setScreenId(screenId);
-            model.setDeliveryPackaging(utilityActivityBean);
-            go(ScreenID.UTILITY_ACTIVITY);
-            break;
+//          case ScreenID.MY_MAIN:
+//          case ScreenID.MY_COIN_MAIN:
+//            utilityActivityBean.setScreenId(screenId);
+//            model.setDeliveryPackaging(utilityActivityBean);
+//            go(ScreenID.UTILITY_ACTIVITY);
+//            break;
           case ScreenID.BUCKET_ACTIVITY:
             model.loadMyBucketCount(event -> {
               BucketDeliveryBean bucketDeliveryBean = new BucketDeliveryBean();

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

@@ -46,13 +46,6 @@ import kr.co.zumo.app.lifeplus.view.screen.my.bucketlist.BucketListDefaultDetail
 import kr.co.zumo.app.lifeplus.view.screen.my.bucketlist.BucketListWithTagDetailFragment;
 import kr.co.zumo.app.lifeplus.view.screen.my.bucketlist.EditMyBucketListFragment;
 import kr.co.zumo.app.lifeplus.view.screen.my.bucketlist.MyBucketListFragment;
-import kr.co.zumo.app.lifeplus.view.screen.my.coin.MyCoinDetailGuestFragment;
-import kr.co.zumo.app.lifeplus.view.screen.my.coin.MyCoinDetailMemberFragment;
-import kr.co.zumo.app.lifeplus.view.screen.my.coin.MyCoinExtinctionFragment;
-import kr.co.zumo.app.lifeplus.view.screen.my.coin.MyCoinMainFragment;
-import kr.co.zumo.app.lifeplus.view.screen.my.main.MyMainGuestFragment;
-import kr.co.zumo.app.lifeplus.view.screen.my.main.MyMainMemberFragment;
-import kr.co.zumo.app.lifeplus.view.screen.my.purchase.MyPurchaseHistoryFragment;
 import kr.co.zumo.app.lifeplus.view.screen.notification.NotiFragment;
 import kr.co.zumo.app.lifeplus.view.screen.onboarding.OnBoardingFragment;
 import kr.co.zumo.app.lifeplus.view.screen.pin.PhoneNumberResetAuthFragment;
@@ -237,33 +230,33 @@ public class BasicFragmentFactory extends FragmentFactory {
         break;
 
       // my
-      case ScreenID.MY_MAIN:
-        fragment = new MyMainMemberFragment();
-        break;
-      case ScreenID.MY_MAIN_GUEST:
-        fragment = new MyMainGuestFragment();
-        break;
+//      case ScreenID.MY_MAIN:
+//        fragment = new MyMainMemberFragment();
+//        break;
+//      case ScreenID.MY_MAIN_GUEST:
+//        fragment = new MyMainGuestFragment();
+//        break;
       case ScreenID.BOOK_MARK_DEFAULT:
         fragment = new DefaultBookMarkFragment();
         break;
       case ScreenID.BOOK_MARK_LIST:
         fragment = new BookMarkListFragment();
         break;
-      case ScreenID.MY_COIN_MAIN:
-        fragment = new MyCoinMainFragment();
-        break;
-      case ScreenID.MY_COIN_DETAIL_GUEST:
-        fragment = new MyCoinDetailGuestFragment();
-        break;
-      case ScreenID.MY_COIN_DETAIL:
-        fragment = new MyCoinDetailMemberFragment();
-        break;
-      case ScreenID.MY_COIN_EXTINCT:
-        fragment = new MyCoinExtinctionFragment();
-        break;
-      case ScreenID.MY_PURCHASE_HISTORY:
-        fragment = new MyPurchaseHistoryFragment();
-        break;
+//      case ScreenID.MY_COIN_MAIN:
+//        fragment = new MyCoinMainFragment();
+//        break;
+//      case ScreenID.MY_COIN_DETAIL_GUEST:
+//        fragment = new MyCoinDetailGuestFragment();
+//        break;
+//      case ScreenID.MY_COIN_DETAIL:
+//        fragment = new MyCoinDetailMemberFragment();
+//        break;
+//      case ScreenID.MY_COIN_EXTINCT:
+//        fragment = new MyCoinExtinctionFragment();
+//        break;
+//      case ScreenID.MY_PURCHASE_HISTORY:
+//        fragment = new MyPurchaseHistoryFragment();
+//        break;
 
       // my - bucket
       case ScreenID.BUCKET_BEST:

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/setting/member/SettingMemberQuitInfoPresenter.java

@@ -86,7 +86,7 @@ public class SettingMemberQuitInfoPresenter extends Presenter<SettingMemberQuitI
    */
   public void onViewClickCoin() {
     // 코인 화면 이동
-    go(ScreenID.MY_COIN_MAIN);
+//    go(ScreenID.MY_COIN_MAIN);
   }
 
   /**