Browse Source

[공통][Bug] API 예외 처리 추가

hyodong.min 7 years ago
parent
commit
3c8acd21af

+ 1 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/activity/ActivityStarter.java

@@ -87,7 +87,7 @@ public class ActivityStarter {
           }
           else {
             // 서버와 통신 완료 후 에러 리턴
-            showErrorPopup("login error - " + loginResultBean.toJson());
+            showErrorPopup("login error - " + loginResultBean.getReturnMessage());
           }
         }, e -> {
           // 서버와 통신이 되지 않은 에러

+ 1 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/bean/api/FAQResultBean.java

@@ -17,7 +17,7 @@ import java.util.ArrayList;
  * @history 민효동   [2018. 10. 1.]   [최초 작성]
  * @since 2018. 10. 1.
  */
-public class FAQResultBean extends RequestBean {
+public class FAQResultBean extends LifeplusAPIBean {
   @SerializedName("data")
   private ArrayList<FAQBean> data;
 

+ 7 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/model/FAQModel.java

@@ -68,8 +68,13 @@ public class FAQModel extends Model {
         .observeOn(AndroidSchedulers.mainThread())
         .subscribe(resultBean -> {
           Log.i("APP# FAQModel | loadFaq", "| " + resultBean.toPrettyJson());
-          faqBeans = resultBean.getData();
-          onResult(new Event.Builder(Event.RESULT).build());
+          if (resultBean.isSuccess()) {
+            faqBeans = resultBean.getData();
+            onResult(new Event.Builder(Event.RESULT).build());
+          }
+          else {
+            onResult(new Event.Builder(Event.ERROR).string(resultBean.getReturnMessage()).build());
+          }
         }, e -> {
           onResult(new Event.Builder(Event.ERROR).string(e.getLocalizedMessage()).build());
         })

+ 11 - 3
app/src/main/java/kr/co/zumo/app/lifeplus/model/SignUpModel.java

@@ -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());
         })