[회원가입][Bug] 모바일 인증: 모델 이벤트 수정

app/src/main/java/kr/co/zumo/app/lifeplus/model/SignUpModel.java

@@ -364,30 +364,30 @@ public class SignUpModel extends Model {
       checkMobileAuthorized();
 
       // 토스트를 위한 이벤트 전달.
-      presenter.onEvent(new Event.Builder(Event.SUCCESS).integer(Event.MEMBER_AUTH).build());
+      onResult(new Event.Builder(Event.SUCCESS).integer(Event.MEMBER_AUTH).build());
 
       disposable.add(
         Completable.timer(2000, TimeUnit.MILLISECONDS, AndroidSchedulers.mainThread())
           .subscribe(() -> {
-            presenter.onEvent(new Event.Builder(Event.CONFIRM).integer(Event.MEMBER_AUTH).build());
+            onResult(new Event.Builder(Event.CONFIRM).integer(Event.MEMBER_AUTH).build());
           }, Throwable::printStackTrace)
       );
     }
     else if (resultBean.getCode() == LifeplusAPIBean.RETURN_MOBILE_AUTH_ERROR_UNDER_14_YEARS) {
       //14세 미만
-      presenter.onEvent(new Event.Builder(Event.SUCCESS).integer(Event.MEMBER_UNDER_14YEARS).build());
+      onResult(new Event.Builder(Event.SUCCESS).integer(Event.MEMBER_UNDER_14YEARS).build());
     }
     else if (resultBean.getCode() == LifeplusAPIBean.RETURN_MOBILE_AUTH_ERROR_ALREADY_MEMBER) {
       // 이미 회원
-      presenter.onEvent(new Event.Builder(Event.SUCCESS).integer(Event.MEMBER_ALREADY_MEMBER).build());
+      onResult(new Event.Builder(Event.SUCCESS).integer(Event.MEMBER_ALREADY_MEMBER).build());
     }
     else if (resultBean.getCode() == LifeplusAPIBean.RETURN_MOBILE_AUTH_ERROR_NEED_FOR_30_DAYS) {
       // 30일이내 가입
       SuperModel.getInstance().addMemberStatus(SuperModel.MEMBER_STATUS_BIT_OUT);
-      presenter.onEvent(new Event.Builder(Event.SUCCESS).integer(Event.MEMBER_NEED_30DAYS).build());
+      onResult(new Event.Builder(Event.SUCCESS).integer(Event.MEMBER_NEED_30DAYS).build());
     }
     else {
-      presenter.onEvent(new Event.Builder(Event.ERROR).integer(Event.MEMBER_AUTH).build());
+      onResult(new Event.Builder(Event.ERROR).integer(Event.MEMBER_AUTH).build());
     }
   }
 

app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/auth/MobileAuthPresenter.java

@@ -524,9 +524,7 @@ public class MobileAuthPresenter implements IMobileAuthContract.Presenter {
 
       prepareConfirm();
 
-      doHideKeyBoard();
       view.setEnabledRequestNumberButton(false);
-      view.requestFocusAuthorizedNumber();
 
       AuthRequestBean bean = new AuthRequestBean();
       bean.setName(userBean.getName());
@@ -574,6 +572,7 @@ public class MobileAuthPresenter implements IMobileAuthContract.Presenter {
     numberRequestingCount++;
     countRetryButton();
 
+    view.requestFocusAuthorizedNumber();
   }
 
   private void setEnabledConfirmView(boolean isEnabled) {

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

@@ -85,37 +85,6 @@ public class SignUpMobileAuthPresenter extends SignUpFragmentPresenter {
 
   @Override
   public void onResult(Event event) {
-
-  }
-
-  @Override
-  public boolean onBackPressed() {
-    DialogBuilder.create(DialogID.ALERT)
-      .listener(new IDialogResultListener() {
-        @Override
-        public void onDialogResult(DialogBase dialog, Event event) {
-          if (event.getEventId() == Event.CONFIRM) {
-            dialog.dispose();
-
-            onCommand(new ActivityChangeCommand(ScreenID.ACTIVITY_MAIN, ScreenID.DIRECTION_BACK));
-//    onCommand(new FragmentChangeCommand(ScreenID.SIGN_UP_PIN, ScreenID.DIRECTION_BACK));
-          }
-        }
-
-        @Override
-        public void onDialogCanceled(DialogBase dialog) {
-          dialog.dispose();
-        }
-      })
-      .attribute((IAttribute<CustomAlertDialog>) dialog -> {
-        dialog.setText(ResourceUtil.getString(model.getBackwardWarnStringId()));
-      })
-      .show();
-    return true;
-  }
-
-  @Override
-  protected void onEventInternal(Event event) {
     switch (event.getEventId()) {
       case Event.CONFIRM:
         if (event.getInteger() == Event.MEMBER_AUTH) {
@@ -156,6 +125,44 @@ public class SignUpMobileAuthPresenter extends SignUpFragmentPresenter {
     }
   }
 
+  @Override
+  public boolean onBackPressed() {
+    DialogBuilder.create(DialogID.ALERT)
+      .listener(new IDialogResultListener() {
+        @Override
+        public void onDialogResult(DialogBase dialog, Event event) {
+          if (event.getEventId() == Event.CONFIRM) {
+            dialog.dispose();
+
+            onCommand(new ActivityChangeCommand(ScreenID.ACTIVITY_MAIN, ScreenID.DIRECTION_BACK));
+//    onCommand(new FragmentChangeCommand(ScreenID.SIGN_UP_PIN, ScreenID.DIRECTION_BACK));
+          }
+        }
+
+        @Override
+        public void onDialogCanceled(DialogBase dialog) {
+          dialog.dispose();
+        }
+      })
+      .attribute((IAttribute<CustomAlertDialog>) dialog -> {
+        dialog.setText(ResourceUtil.getString(model.getBackwardWarnStringId()));
+      })
+      .show();
+    return true;
+  }
+
+  @Override
+  protected void onEventInternal(Event event) {
+    switch (event.getEventId()) {
+      case Event.SUCCESS:
+        Log.i("APP# SignUpMobileAuthPresenter | onEventInternal", "|" + "resultString: " + event.getJson());
+        model.onAuthResult(event);
+        break;
+      default:
+        break;
+    }
+  }
+
   private void showPopup() {
     dialog = DialogBuilder.create(DialogID.CONFIRM)
       .listener(new IDialogResultListener() {

app/src/main/res/values/strings.xml

@@ -188,11 +188,11 @@
   <string name="sign_up_back_warning">화면 이탈 시 회원가입 과정이 초기화 됩니다.\n정말 나가시겠습니까?</string>
   <string name="sign_up_back_warning_from_zumo">화면 이탈 시 회원전환 과정이 초기화 됩니다.\n정말 나가시겠습니까?</string>
 
-  <string name="network_disconnected_message">서버와의 통신이 \n 원활하지 않습니다.</string>
-  <string name="network_disconnected_message_detail">네트워크 연결이 원활하지 않습니다. \n사용중인 네트워크 상태를 확인해주세요.</string>
-  <string name="error_message_404type">잠시 서비스를 \n 이용하실 수 없습니다.</string>
-  <string name="error_detail_message_404type">서비스 이용에 불편을 드려 죄송합니다. \n 잠시 후 다시 이용해 주시기 바랍니다.</string>
-  <string name="error_message_500type">서비스 이용에 불편을 드려 \n 죄송합니다.</string>
+  <string name="network_disconnected_message">서버와의 통신이 \n원활하지 않습니다.</string>
+  <string name="network_disconnected_message_detail">네트워크 연결이 원활하지 않습니다.\n사용중인 네트워크 상태를 확인해주세요.</string>
+  <string name="error_message_404type">잠시 서비스를 \n이용하실 수 없습니다.</string>
+  <string name="error_detail_message_404type">서비스 이용에 불편을 드려 죄송합니다. \n잠시 후 다시 이용해 주시기 바랍니다.</string>
+  <string name="error_message_500type">서비스 이용에 불편을 드려 \n죄송합니다.</string>
   <string name="error_detail_message_500type">잠시 후 다시 이용해 주시기 바립니다.</string>
   <string name="email_inquiry">이메일 문의</string>
   <string name="email_address">lifeplus@hanwha.com</string>
@@ -205,7 +205,7 @@
   <string name="button_add_email"><u>Email 등록</u></string>
 
   <string name="tutorial_title">내일상의 플러스</string>
-  <string name="tutorial_start">삶을 더 잘 살기 위한 이야기, \n 시작해볼까요?</string>
+  <string name="tutorial_start">삶을 더 잘 살기 위한 이야기, \n시작해볼까요?</string>
   <string name="tutorial_button_message">회원가입하고 혜택 받기</string>
   <string name="tutorial_bottom_jump">건너뛰기</string>
   <string name="tutorial_bottom_close">닫기</string>