|
|
@@ -102,10 +102,11 @@ public class SignUpAgreeModel extends Model {
|
|
|
*/
|
|
|
public void saveUserId(String userId) {
|
|
|
Log.i("APP# SignUpModel | saveUserId", "| userId: " + userId);
|
|
|
+ // init
|
|
|
SuperModel.getInstance().renewMemberData();
|
|
|
|
|
|
+ // reset
|
|
|
SuperModel.getInstance().setUserId(userId);
|
|
|
-
|
|
|
MobileAuthBean mobileAuthBean = SignUpModelHelper.getInstance().getMobileAuthBean();
|
|
|
if (StringUtil.isFull(mobileAuthBean.getName())) {
|
|
|
SuperModel.getInstance().setUserName(mobileAuthBean.getName());
|
|
|
@@ -174,10 +175,10 @@ public class SignUpAgreeModel extends Model {
|
|
|
else {
|
|
|
// 필수 항목 체크 완료;
|
|
|
|
|
|
+ // 선택 동의 확인
|
|
|
ArrayList<PolicyNumberBean> policyList = new ArrayList<>();
|
|
|
List<PolicyBean> agreeBean = getAgreeItems();
|
|
|
if (null != agreeBean) {
|
|
|
-
|
|
|
for (PolicyBean bean : agreeBean) {
|
|
|
if (bean.isMandatory() == false && bean.isChecked()) {
|
|
|
policyList.add(new PolicyNumberBean(bean.getPolicyNumber(), true));
|
|
|
@@ -197,22 +198,30 @@ public class SignUpAgreeModel extends Model {
|
|
|
disposable.add(new APIMemberInsertModule().call(bean, new IAPIModuleListener<MemberJoinResultBean>() {
|
|
|
@Override
|
|
|
public void onApiSuccess(MemberJoinResultBean resultBean) {
|
|
|
+
|
|
|
saveUserId(resultBean.getData().getUserNo());
|
|
|
+
|
|
|
SuperModel.getInstance().saveEncryptedPin(SignUpModelHelper.getInstance().getEncryptedPin());
|
|
|
onResult(new Event.Builder(Event.RESULT).integer(Event.MEMBER_JOIN).build());
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public void onApiReason(MemberJoinResultBean resultBean) {
|
|
|
+ if (resultBean.getCode() == LifeplusAPIBean.RETURN_SIGN_UP_ERROR_ALREADY_MEMBER) {
|
|
|
+ // 이미 가입한 회원 (탈퇴 안한 상태?)
|
|
|
+
|
|
|
+ // 이 경우에도 userNo 는 필요함.
|
|
|
+ // fixme userId 를 저장하면 앱 재실행 시 이상없이 로그인 된다.
|
|
|
+ //
|
|
|
+ saveUserId(resultBean.getData().getUserNo());
|
|
|
+
|
|
|
+ onResult(new Event.Builder(Event.RESULT).integer(Event.MEMBER_ALREADY_MEMBER).build());
|
|
|
+ }
|
|
|
if (resultBean.getCode() == LifeplusAPIBean.RETURN_MOBILE_AUTH_ERROR_NEED_FOR_30_DAYS) {
|
|
|
// 탈퇴 30일 회원 구분
|
|
|
SuperModel.getInstance().addMemberStatus(SuperModel.MEMBER_STATUS_BIT_OUT);
|
|
|
onResult(new Event.Builder(Event.RESULT).integer(Event.MEMBER_NEED_30DAYS).build());
|
|
|
}
|
|
|
- if (resultBean.getCode() == LifeplusAPIBean.RETURN_SIGN_UP_ERROR_ALREADY_MEMBER) {
|
|
|
- // 이미 가입한 회원 (탈퇴안한 상태?)
|
|
|
- onResult(new Event.Builder(Event.RESULT).integer(Event.MEMBER_ALREADY_MEMBER).build());
|
|
|
- }
|
|
|
else {
|
|
|
onResult(new Event.Builder(Event.ERROR).integer(Event.MEMBER_JOIN).string(resultBean.getReturnMessage()).build());
|
|
|
}
|