Merge branch 'develop' of https://github.com/swict/LifePlusAndroid into develop

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

@@ -111,9 +111,16 @@ public class SignUpModel extends Model {
   }
 
 
+  /**
+   * 핀 저장
+   *
+   * @param pin
+   */
   public void savePin(String pin) {
     try {
-      SuperModel.getInstance().getPreferences().setEncryptedPin(StringUtil.convertToSHA256(StringUtil.convertToMD5(pin)));
+      String encryptedPin = StringUtil.convertToSHA256(StringUtil.convertToMD5(pin));
+      Log.i("APP# SignUpModel | savePin", "| pin: " + pin + ", encryptedPin: " + encryptedPin);
+      SuperModel.getInstance().getPreferences().setEncryptedPin(encryptedPin);
     } catch (Exception e) {
       e.printStackTrace();
     }
@@ -154,4 +161,19 @@ public class SignUpModel extends Model {
     }
   }
 
+  /**
+   * 모바일 인증 했음을 표시;
+   */
+  public void checkMobileAuthorized() {
+    signUpBean.setAuthorized(true);
+  }
+
+  /**
+   * 모바일 인증 했음 확인
+   *
+   * @return
+   */
+  public boolean isMobileAuthorized() {
+    return signUpBean.isAuthorized();
+  }
 }

app/src/main/java/kr/co/zumo/app/lifeplus/view/dialog/MobileAuthorizationPresenter.java

@@ -81,6 +81,11 @@ public class MobileAuthorizationPresenter {
       disposable = null;
     }
 
+    if (null != remainTimeDisposable) {
+      remainTimeDisposable.dispose();
+      remainTimeDisposable = null;
+    }
+
     if (null != dialog) {
       if (dialog.isDismissed() == false) {
         dialog.dismiss();

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

@@ -115,6 +115,8 @@ public class SignUpMobileAuthorizationPresenter extends SignUpFragmentPresenter
     }
     else {
       // 신규 가입
+      model.checkMobileAuthorized();
+
       onEvent(new Event.Builder(Event.CONFIRM).build());
     }
   }