[회원][Bug] 잠금 회원 해제 시 회원 상태 업데이트 하지 않던 버그 수정

app/src/main/java/kr/co/zumo/app/lifeplus/model/module/APIMemberActivateModule.java

@@ -6,6 +6,7 @@ package kr.co.zumo.app.lifeplus.model.module;
 import io.reactivex.Single;
 import kr.co.zumo.app.lifeplus.bean.api.MemberActivateResultBean;
 import kr.co.zumo.app.lifeplus.bean.api.RequestBean;
+import kr.co.zumo.app.lifeplus.model.SuperModel;
 import kr.co.zumo.app.lifeplus.network.api.LifeplusAPIRepository;
 
 /**
@@ -22,6 +23,9 @@ public class APIMemberActivateModule extends LifeplusAPIModule<RequestBean, Memb
 
   @Override
   protected Single<MemberActivateResultBean> getAPI(RequestBean requestBean) {
-    return new LifeplusAPIRepository().updateUnRestMember(requestBean);
+    return new LifeplusAPIRepository().updateUnRestMember(requestBean)
+      .doOnSuccess(bean -> {
+        SuperModel.getInstance().deleteMemberStatus(SuperModel.MEMBER_STATUS_BIT_REST);
+      });
   }
 }

app/src/main/java/kr/co/zumo/app/lifeplus/model/module/APIMemberUnlockModule.java

@@ -6,6 +6,7 @@ package kr.co.zumo.app.lifeplus.model.module;
 import io.reactivex.Single;
 import kr.co.zumo.app.lifeplus.bean.api.LifeplusAPIBean;
 import kr.co.zumo.app.lifeplus.bean.api.RequestBean;
+import kr.co.zumo.app.lifeplus.model.SuperModel;
 import kr.co.zumo.app.lifeplus.network.api.LifeplusAPIRepository;
 
 /**
@@ -22,6 +23,9 @@ public class APIMemberUnlockModule extends LifeplusAPIModule<RequestBean, Lifepl
 
   @Override
   protected Single<LifeplusAPIBean> getAPI(RequestBean requestBean) {
-    return new LifeplusAPIRepository().updateUnlockMember(requestBean);
+    return new LifeplusAPIRepository().updateUnlockMember(requestBean)
+      .doOnSuccess(bean -> {
+        SuperModel.getInstance().deleteMemberStatus(SuperModel.MEMBER_STATUS_BIT_BLOCK);
+      });
   }
 }

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

@@ -109,7 +109,7 @@ public class ScreenID {
   public static final int PIN_RESET_AUTH_FROM_MULTI_DEVICE = 87;
   public static final int PIN_RESET_INPUT_FROM_MULTI_DEVICE = 88;
   public static final int PIN_RESET_AUTH_FROM_MEMBER_BLOCK = 90;
-  public static final int PIN_RESET_INPUT_FROM_MEMBER_BLOCK = 91;
+  //  public static final int PIN_RESET_INPUT_FROM_MEMBER_BLOCK = 91; // 잠금 해제 시 핀 설정은 하지 않음
   public static final int MEMBER_UNLOCK = 92;
   public static final int EVENT_RECOMMEND = 93;
   public static final int EVENT_RECOMMEND_BASIC = 1094;
@@ -128,7 +128,7 @@ public class ScreenID {
     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,
     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, /*PIN_RESET_INPUT_FROM_MEMBER_BLOCK,*/ MEMBER_UNLOCK, EVENT_DETAIL_ENTRY, EVENT_DETAIL_SELECT, EVENT_RECOMMEND, EVENT_RECOMMEND_BASIC, EVENT_RECOMMEND_TAG,
     EVENT_RECORD, WEB_PURCHASE
   })
   public @interface ID {}

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

@@ -61,7 +61,6 @@ import kr.co.zumo.app.lifeplus.view.screen.pin.PhoneNumberResetAuthFragment;
 import kr.co.zumo.app.lifeplus.view.screen.pin.PinResetAuthFragment;
 import kr.co.zumo.app.lifeplus.view.screen.pin.PinResetFromAlreadyMemberInputFragment;
 import kr.co.zumo.app.lifeplus.view.screen.pin.PinResetFromMemberBlockAuthFragment;
-import kr.co.zumo.app.lifeplus.view.screen.pin.PinResetFromMemberBlockInputFragment;
 import kr.co.zumo.app.lifeplus.view.screen.pin.PinResetFromMultiDeviceAuthFragment;
 import kr.co.zumo.app.lifeplus.view.screen.pin.PinResetFromMultiDeviceInputFragment;
 import kr.co.zumo.app.lifeplus.view.screen.pin.PinResetFromSettingAuthFragment;
@@ -213,9 +212,9 @@ public class BasicFragmentFactory extends FragmentFactory {
       case ScreenID.PIN_RESET_AUTH_FROM_MEMBER_BLOCK:
         fragment = new PinResetFromMemberBlockAuthFragment();
         break;
-      case ScreenID.PIN_RESET_INPUT_FROM_MEMBER_BLOCK:
-        fragment = new PinResetFromMemberBlockInputFragment();
-        break;
+//      case ScreenID.PIN_RESET_INPUT_FROM_MEMBER_BLOCK:
+//        fragment = new PinResetFromMemberBlockInputFragment();
+//        break;
       case ScreenID.PHONE_NUMBER_RESET:
         fragment = new PhoneNumberResetAuthFragment();
         break;

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

@@ -7,7 +7,6 @@ import io.reactivex.disposables.Disposable;
 import kr.co.zumo.app.lifeplus.bean.api.MemberActivateResultBean;
 import kr.co.zumo.app.lifeplus.bean.api.RequestBean;
 import kr.co.zumo.app.lifeplus.model.CoinModel;
-import kr.co.zumo.app.lifeplus.model.SuperModel;
 import kr.co.zumo.app.lifeplus.model.module.APIError;
 import kr.co.zumo.app.lifeplus.model.module.APIMemberActivateModule;
 import kr.co.zumo.app.lifeplus.model.module.APIModuleListener;
@@ -84,7 +83,6 @@ public class RestMemberModel extends CoinModel {
 
         setGivenCoin(resultBean.getData().getIntCoin());
 
-        SuperModel.getInstance().deleteMemberStatus(SuperModel.MEMBER_STATUS_BIT_REST);
         onResult(new Event.Builder(Event.SUCCESS).build());
       }
 

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/pin/PinResetAuthModel.java

@@ -234,4 +234,34 @@ public class PinResetAuthModel extends Model {
       })
     );
   }
+
+
+  /**
+   * 블럭 멥버 확인
+   *
+   * @return
+   */
+  public boolean isBlockMember() {
+    return SuperModel.getInstance().isBlockMember();
+  }
+
+  /**
+   * 휴면 멤버 확인
+   *
+   * @return
+   */
+  public boolean isRestMember() {
+    return SuperModel.getInstance().isRestMember();
+  }
+
+  /**
+   * 탈퇴 멤버 확인
+   * - 이 단계에서 발생할 경우는 없다.
+   *
+   * @return
+   */
+  public boolean isUnregisterMember() {
+    return SuperModel.getInstance().isUnregisterMember();
+  }
+
 }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/pin/PinResetFromMemberBlockAuthPresenter.java

@@ -42,9 +42,17 @@ public class PinResetFromMemberBlockAuthPresenter extends PinResetAuthPresenter<
    * - 각 진입 화면마다 Fragment 와 Presenter 를 extends 하여 지정해준다.
    */
   protected void moveToNext() {
-//    go(ScreenID.PIN_RESET_INPUT_FROM_MEMBER_BLOCK);
     // pin 입력 없이 잠금해제 완료 화면으로 이동
-    go(ScreenID.MEMBER_UNLOCK);
+    //    go(ScreenID.PIN_RESET_INPUT_FROM_MEMBER_BLOCK);
+
+    if (model.isRestMember()) {
+      // 휴면 계정
+      go(ScreenID.REST_MEMBER_START);
+    }
+    else {
+      // 정상
+      go(ScreenID.MEMBER_UNLOCK);
+    }
   }
 
   /**

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/pin/PinResetFromMemberBlockInputFragment.java

@@ -13,6 +13,7 @@ package kr.co.zumo.app.lifeplus.view.screen.pin;
  * @history 민효동   [2018-11-03]   [최초 작성]
  * @since 2018-11-03
  */
+@Deprecated
 public class PinResetFromMemberBlockInputFragment extends PinResetInputFragment {
 
   @Override

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/pin/PinResetFromMemberBlockInputPresenter.java

@@ -16,6 +16,7 @@ import kr.co.zumo.app.lifeplus.view.Event;
  * @history 민효동   [2018-11-03]   [최초 작성]
  * @since 2018-11-03
  */
+@Deprecated
 public class PinResetFromMemberBlockInputPresenter extends PinResetInputPresenter {
 
   public PinResetFromMemberBlockInputPresenter(PinResetInputModel model, IPinResetInputView view) {

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/signup/SignUpAgreePresenter.java

@@ -119,10 +119,12 @@ public class SignUpAgreePresenter extends SignUpBasePresenter<SignUpAgreeModel,
 
   private void onLogin() {
     if (model.isBlockMember()) {
+      // todo 처음 가입인데 잠금 회원일 가능성?
       model.setDeliveryPackaging(model.getLoginBean());
       go(ScreenID.MEMBER_BLOCK);
     }
     else if (model.isRestMember()) {
+      // todo 처음 가입인데 휴면 회원일 가능성?
       go(ScreenID.REST_MEMBER_START);
     }
     else {