|
|
@@ -176,6 +176,9 @@ public class SignUpModel extends Model {
|
|
|
agreeItems = resultBean.getData();
|
|
|
onResult(new Event.Builder(Event.RESULT).integer(Event.POLICY_REQUEST).build());
|
|
|
}
|
|
|
+ else {
|
|
|
+ onResult(new Event.Builder(Event.ERROR).integer(Event.POLICY_REQUEST).string(resultBean.getReturnMessage()).build());
|
|
|
+ }
|
|
|
}, e -> {
|
|
|
onResult(new Event.Builder(Event.ERROR).integer(Event.POLICY_REQUEST).string(e.getLocalizedMessage()).build());
|
|
|
})
|
|
|
@@ -253,7 +256,7 @@ public class SignUpModel extends Model {
|
|
|
}
|
|
|
else {
|
|
|
// 기타 에러;
|
|
|
- onResult(new Event.Builder(Event.ERROR).integer(Event.MEMBER_JOIN).string(resultBean.toJson()).build());
|
|
|
+ onResult(new Event.Builder(Event.ERROR).integer(Event.MEMBER_JOIN).string(resultBean.getReturnMessage()).build());
|
|
|
}
|
|
|
}, e -> {
|
|
|
Log.i("APP# SignUpModel | signUp", "|" + e.getLocalizedMessage());
|
|
|
@@ -279,7 +282,7 @@ public class SignUpModel extends Model {
|
|
|
}
|
|
|
else {
|
|
|
// 서버와 통신 완료 후 에러 리턴
|
|
|
- onResult(new Event.Builder(Event.ERROR).integer(Event.MEMBER_LOGIN).string(loginResultBean.toJson()).build());
|
|
|
+ onResult(new Event.Builder(Event.ERROR).integer(Event.MEMBER_LOGIN).string(loginResultBean.getReturnMessage()).build());
|
|
|
}
|
|
|
}, e -> {
|
|
|
// 서버와 통신이 되지 않은 에러
|
|
|
@@ -330,7 +333,12 @@ public class SignUpModel extends Model {
|
|
|
.subscribeOn(Schedulers.io())
|
|
|
.observeOn(AndroidSchedulers.mainThread())
|
|
|
.subscribe(resultBean -> {
|
|
|
- onResult(new Event.Builder(Event.RESULT).integer(Event.POLICY_CONFIRM).build());
|
|
|
+ if (resultBean.isSuccess()) {
|
|
|
+ onResult(new Event.Builder(Event.RESULT).integer(Event.POLICY_CONFIRM).build());
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ onResult(new Event.Builder(Event.ERROR).integer(Event.POLICY_CONFIRM).string(resultBean.getReturnMessage()).build());
|
|
|
+ }
|
|
|
}, e -> {
|
|
|
onResult(new Event.Builder(Event.ERROR).integer(Event.POLICY_CONFIRM).string(e.getLocalizedMessage()).build());
|
|
|
})
|