Explorar o código

[설정][Common] 핀 다이얼로그 설정 변경중

Hasemi %!s(int64=7) %!d(string=hai) anos
pai
achega
e3e5042e23

+ 22 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/pin/CustomPinInputPresenter.java

@@ -3,6 +3,11 @@
  */
 package kr.co.zumo.app.lifeplus.view.custom.pin;
 
+import android.util.Log;
+
+import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.util.ResourceUtil;
+
 /**
  * CustomPinInputPresenter
  * <pre>
@@ -15,12 +20,27 @@ package kr.co.zumo.app.lifeplus.view.custom.pin;
  */
 public class CustomPinInputPresenter extends CustomPinConfirmPresenter {
 
-  public CustomPinInputPresenter(IPinContract.View view, IPinContract.Listener listener) {
+  private boolean isResetButtonVisible;
+
+  public CustomPinInputPresenter(IPinContract.View view, boolean isResetButtonVisible, IPinContract.Listener listener) {
     super(view, listener);
+    this.isResetButtonVisible = isResetButtonVisible;
+    Log.e("APP#  CustomPinInputPresenter | CustomPinInputPresenter", "|" + isResetButtonVisible);
+  }
+
+  @Override
+  public void onPinStart() {
+    view.updateGuideTextColor(ResourceUtil.getColor(R.color.C999999));
+    view.updateTitleText(R.string.confirm_pin_title_text);
+    view.updateGuideText(R.string.confirm_pin_guide_text);
+    view.setHelpButtonVisible(false);
+    view.setCloseButtonVisible(isCloseButtonVisible());
+    view.setResetButtonVisible(isResetButtonVisible());
+    view.restart();
   }
 
   @Override
   protected boolean isResetButtonVisible() {
-    return false;
+    return isResetButtonVisible;
   }
 }

+ 20 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/dialog/PinConfirmDialog.java

@@ -31,6 +31,10 @@ public class PinConfirmDialog extends DialogBase {
 
   private CustomPinView customPinView;
   private IPinContract.Presenter pinPresenter;
+  private boolean isResetButtonVisible;
+  public static final int USER_INFORMATION = 0;
+  public static final int USER_QUIT = 1;
+  public static final int COUPON_MALL = 2;
 
   @Override
   public void onCreate(Bundle savedInstanceState) {
@@ -65,7 +69,7 @@ public class PinConfirmDialog extends DialogBase {
     getDialog().getWindow().getAttributes().windowAnimations = R.style.DialogAnimation;
 
     customPinView = new CustomPinView(getContext());
-    pinPresenter = new CustomPinInputPresenter(customPinView, new IPinContract.Listener() {
+    pinPresenter = new CustomPinInputPresenter(customPinView, isResetButtonVisible, new IPinContract.Listener() {
       @Override
       public void onPinResult(String result) {
         if (null != getCustomListener()) {
@@ -116,4 +120,19 @@ public class PinConfirmDialog extends DialogBase {
     pinPresenter.retry();
   }
 
+  public void setResetButtonVisible(int confirmDialogType) {
+    switch (confirmDialogType) {
+      case USER_INFORMATION:
+        isResetButtonVisible = true;
+        break;
+      case USER_QUIT:
+        isResetButtonVisible = false;
+        break;
+      case COUPON_MALL:
+        break;
+      default:
+        break;
+    }
+  }
+
 }

+ 3 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/setting/SettingPresenter.java

@@ -209,7 +209,9 @@ public class SettingPresenter extends Presenter<SettingModel, ISettingView> {
                   public void onDialogCanceled(PinConfirmDialog dialog) {
                     dialog.dispose();
                   }
-                }).show();
+                })
+                .attribute(dialog1 -> dialog1.setResetButtonVisible(PinConfirmDialog.USER_INFORMATION))
+                .show();
             }
             else {
               go(ScreenID.SIGN_UP_START);

+ 1 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/setting/common/SettingMemberQuitRequestPresenter.java

@@ -12,7 +12,6 @@ import kr.co.zumo.app.lifeplus.view.dialog.DialogBase;
 import kr.co.zumo.app.lifeplus.view.dialog.DialogBuilder;
 import kr.co.zumo.app.lifeplus.view.dialog.DialogID;
 import kr.co.zumo.app.lifeplus.view.dialog.ICustomDialogListener;
-import kr.co.zumo.app.lifeplus.view.dialog.IDialogResultListener;
 import kr.co.zumo.app.lifeplus.view.dialog.PinConfirmDialog;
 import kr.co.zumo.app.lifeplus.view.presenter.Presenter;
 
@@ -142,7 +141,7 @@ public class SettingMemberQuitRequestPresenter extends Presenter<SettingMemberQu
           // do nothing;
 
         }
-      })
+      }).attribute(dialog1 -> {dialog1.setResetButtonVisible(PinConfirmDialog.USER_QUIT);})
       .show();
   }
 

+ 2 - 0
app/src/main/res/values/strings.xml

@@ -87,6 +87,8 @@
   <string name="sign_up_input_pin">간편암호 등록</string>
   <string name="sign_up_input_pin_fail">간편암호 등록 실패</string>
   <string name="sign_up_pin_confirm">간편암호 등록 완료</string>
+  <string name="confirm_pin_title_text">간편암호 확인</string>
+  <string name="confirm_pin_guide_text">회원님의 소중한 개인정보보호를 위해\n간편암호를 입력해주세요.</string>
   <string name="sign_up_id_confirm_completed">본인인증이 완료되었습니다.</string>
   <string name="sign_up_pin_confirm_completed">정상적으로 등록되었습니다.</string>
   <string name="sign_up_agree_completed">약관 동의 완료</string>