浏览代码

[공통][Bug] 상수 및 메서드 이름 변경

hyodong.min 7 年之前
父节点
当前提交
2c4d436f4a

+ 15 - 3
app/src/main/java/kr/co/zumo/app/lifeplus/view/dialog/MobileAuthorizationDialog.java

@@ -70,9 +70,21 @@ public class MobileAuthorizationDialog extends DialogBase implements View.OnClic
   public void onCreate(Bundle savedInstanceState) {
     setStyle(DialogFragment.STYLE_NORMAL, R.style.CustomDialog);
     presenter = new MobileAuthorizationPresenter(this);
+    if(null != resultListener) {
+      presenter.setResultListener(resultListener);
+    }
     super.onCreate(savedInstanceState);
   }
 
+  @Override
+  public void setResultListener(IDialogResultListener resultListener) {
+    super.setResultListener(resultListener);
+
+    if(null != presenter) {
+      presenter.setResultListener(resultListener);
+    }
+  }
+
   /**
    * CustomDialog view 화면 리턴, 상단바 타이틀 제목을 설정하여 띄운다.
    *
@@ -305,13 +317,13 @@ public class MobileAuthorizationDialog extends DialogBase implements View.OnClic
 
     switch (view.getId()) {
       case R.id.button_phone_identify_confirm:
-        presenter.onIdentifyConfirmButtonClick();
+        presenter.onAuthorizationConfirmButtonClick();
         break;
       case R.id.button_phone_identify_time_delay:
-        presenter.onIdentifyTimeDelayButtonClick();
+        presenter.onAuthorizationTimeDelayButtonClick();
         break;
       case R.id.button_identify_number_send:
-        presenter.onIdentifyNumberSendButtonClick();
+        presenter.onAuthorizationNumberSendButtonClick();
         break;
       default:
         break;

+ 13 - 5
app/src/main/java/kr/co/zumo/app/lifeplus/view/dialog/MobileAuthorizationPresenter.java

@@ -2,6 +2,8 @@ package kr.co.zumo.app.lifeplus.view.dialog;
 
 import android.util.Log;
 
+import java.util.Calendar;
+
 import kr.co.zumo.app.lifeplus.view.presenter.bean.SignUpUserBean;
 
 /**
@@ -23,6 +25,12 @@ public class MobileAuthorizationPresenter {
     this.view = iMobileAuthorizationDialog;
   }
 
+  protected IDialogResultListener resultListener;
+
+  public void setResultListener(IDialogResultListener resultListener) {
+    this.resultListener = resultListener;
+  }
+
   /**
    * name 필드의 입력시 호출
    *
@@ -166,24 +174,24 @@ public class MobileAuthorizationPresenter {
   /**
    * 인증 확인 버튼 클릭, 인증 번호 확인 후 가입 완료.
    */
-  public void onIdentifyConfirmButtonClick() {
+  public void onAuthorizationConfirmButtonClick() {
     String authorizedNumber = userBean.getAuthorizedNumber();
-    Log.e("APP#  MobileAuthorizationPresenter | onIdentifyConfirmButtonClick", "|" + "click");
+    Log.e("APP#  MobileAuthorizationPresenter | onAuthorizationConfirmButtonClick", "|" + "click");
   }
 
   /**
    * 인증번호 발송 버튼 클릭, 인증 번호 발송 전 user 정보 data 준비.
    */
-  public void onIdentifyNumberSendButtonClick() {
+  public void onAuthorizationNumberSendButtonClick() {
     view.onIdentifyNumberSendButtonClick();
-    Log.e("APP#  MobileAuthorizationPresenter | onIdentifyNumberSendButtonClick", "|" + userBean.toJson());
+    Log.e("APP#  MobileAuthorizationPresenter | onAuthorizationNumberSendButtonClick", "|" + userBean.toJson());
 
   }
 
   /**
    * 인증번호 시간 지연 버튼 클릭
    */
-  public void onIdentifyTimeDelayButtonClick() {
+  public void onAuthorizationTimeDelayButtonClick() {
 
   }
 }

+ 1 - 3
app/src/main/java/kr/co/zumo/app/lifeplus/view/presenter/signup/SignUpItem.java

@@ -37,9 +37,7 @@ public class SignUpItem {
 
   public static final int BUTTON_ID_PIN = 1000;
   public static final int BUTTON_ID_JOINED = 1001;
-  public static final int BUTTON_PHONE_IDENTIFY_POP_UP = 1002;
-  public static final int BUTTON_PHONE_IDENTIFY = 1003;
-  public static final int BUTTON_PHONE_IDENTIFY_TIME_DELAY = 1004;
+  public static final int BUTTON_MOBILE_AUTHORIZATION = 1003;
   public static final int BUTTON_AGREE_COMPLETE = 1005;
 
   public static final int AGREE_FALSE = 2000;

+ 3 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/view/presenter/signup/SignUpStepAuthorization.java

@@ -37,15 +37,16 @@ public class SignUpStepAuthorization extends SignUpStep {
 
     addItem(new SignUpItem(SignUpItem.SIGN_UP_DIVIDER, new TextBean(ResourceUtil.getString(R.string.sign_up_identify)).toJson()));
     addItem(new SignUpItem(SignUpItem.SIGN_UP_TEXT, SignUpItem.ALIGN_START, new TextBean(ResourceUtil.getString(R.string.sign_up_need_id)).toJson()));
-    addItem(new SignUpItem(SignUpItem.SIGN_UP_BUTTON, SignUpItem.ALIGN_CENTER, new SignUpButtonBean(ResourceUtil.getString(R.string.sign_up_mobile_identify), SignUpItem.BUTTON_PHONE_IDENTIFY).toJson(), buttonEventListener));
+    addItem(new SignUpItem(SignUpItem.SIGN_UP_BUTTON, SignUpItem.ALIGN_CENTER, new SignUpButtonBean(ResourceUtil.getString(R.string.sign_up_mobile_identify), SignUpItem.BUTTON_MOBILE_AUTHORIZATION).toJson(), buttonEventListener));
 
   }
 
   private ISignUpHolderEventListener buttonEventListener = (holder, eventId, type, param) -> {
     Log.i("APP# SignUpStepAuthorization | ", "|" + "holder: " + holder + ", eventId: " + eventId + ", type: " + type);
-    if (SignUpItem.BUTTON_PHONE_IDENTIFY == type) {
+    if (SignUpItem.BUTTON_MOBILE_AUTHORIZATION == type) {
       DialogManager dialogManager = new DialogManager();
       dialogManager.show(DialogHelper.getInstance().getFragmentManager(), DialogID.MOBILE_AUTHORIZATION, (dialog, resultCode, resultString) -> {
+        Log.i("APP# SignUpStepAuthorization | ", "|" + "resultString: " + resultString);
         if (DialogResult.CODE_SUCCESS == resultCode) {
           dialog.dismiss();