返回新增错误码

app/src/main/java/com/miekir/eden/constant/EdenError.java

@@ -1,5 +1,7 @@
 package com.miekir.eden.constant;
 
+import com.miekir.network.constant.Code;
+
 /**
  * Copyright (C), 2019-2020, Miekir
  *
@@ -7,7 +9,6 @@ package com.miekir.eden.constant;
  * @date 2020/9/12 16:24
  * Description: 错误码
  */
-public interface EdenError {
-    int COMMON = -1;
-    int SUCCESS = 0;
+public class EdenError extends Code {
+    private EdenError(){}
 }

app/src/main/java/com/miekir/eden/ui/home/about/upgrade/UpgradePresenter.java

@@ -30,14 +30,14 @@ public class UpgradePresenter extends BasePresenter<ICommonView<UpgradeBean>> {
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new BaseObserver<UpgradeBean>() {
                     @Override
-                    public void onSuccess(UpgradeBean result) {
+                    public void onSuccess(int code, UpgradeBean result) {
                         if (getView() != null) {
                             getView().onCommonResult(true, EdenError.SUCCESS, result);
                         }
                     }
 
                     @Override
-                    public void onFailure(Throwable e, String errMsg) {
+                    public void onFailure(int code, Throwable e, String errMsg) {
                         if (getView() != null) {
                             getView().onCommonResult(false, EdenError.COMMON, null);
                         }

app/src/main/java/com/miekir/eden/ui/home/coupon/TemplatePresenter.java

@@ -29,14 +29,14 @@ public class TemplatePresenter extends BasePresenter<ITemplateView<String>> {
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new BaseObserver<List<String>>() {
                     @Override
-                    public void onSuccess(List<String> result) {
+                    public void onSuccess(int code, List<String> result) {
                         if (getView() != null) {
                             getView().onTemplateDataCome(true, EdenError.SUCCESS, result);
                         }
                     }
 
                     @Override
-                    public void onFailure(Throwable e, String errMsg) {
+                    public void onFailure(int code, Throwable e, String errMsg) {
                         if (getView() != null) {
                             getView().onTemplateDataCome(false, EdenError.COMMON, null);
                         }
@@ -53,14 +53,14 @@ public class TemplatePresenter extends BasePresenter<ITemplateView<String>> {
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new BaseObserver<String>() {
                     @Override
-                    public void onSuccess(String result) {
+                    public void onSuccess(int code, String result) {
                         if (getView() != null) {
                             getView().onDeleteCouponResult(true, EdenError.SUCCESS, position);
                         }
                     }
 
                     @Override
-                    public void onFailure(Throwable e, String errMsg) {
+                    public void onFailure(int code, Throwable e, String errMsg) {
                         if (getView() != null) {
                             getView().onDeleteCouponResult(false, EdenError.COMMON, position);
                         }

app/src/main/java/com/miekir/eden/ui/home/goods/GoodsPresenter.java

@@ -27,14 +27,14 @@ public class GoodsPresenter extends BasePresenter<IGoodsView> {
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new BaseObserver<List<GoodsBean>>() {
                     @Override
-                    public void onSuccess(List<GoodsBean> result) {
+                    public void onSuccess(int code, List<GoodsBean> result) {
                         if (getView() != null) {
                             getView().onGoodsDataCome(true, EdenError.SUCCESS, result);
                         }
                     }
 
                     @Override
-                    public void onFailure(Throwable e, String errMsg) {
+                    public void onFailure(int code, Throwable e, String errMsg) {
                         if (getView() != null) {
                             getView().onGoodsDataCome(false, EdenError.COMMON, null);
                         }
@@ -50,14 +50,14 @@ public class GoodsPresenter extends BasePresenter<IGoodsView> {
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new BaseObserver<String>() {
                     @Override
-                    public void onSuccess(String result) {
+                    public void onSuccess(int code, String result) {
                         if (getView() != null) {
                             getView().onDeleteGoodsResult(true, EdenError.SUCCESS, position);
                         }
                     }
 
                     @Override
-                    public void onFailure(Throwable e, String errMsg) {
+                    public void onFailure(int code, Throwable e, String errMsg) {
                         if (getView() != null) {
                             getView().onDeleteGoodsResult(false, EdenError.COMMON, position);
                         }
@@ -73,14 +73,14 @@ public class GoodsPresenter extends BasePresenter<IGoodsView> {
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new BaseObserver<String>() {
                     @Override
-                    public void onSuccess(String result) {
+                    public void onSuccess(int code, String result) {
                         if (getView() != null) {
                             getView().onRevertGoodsEnable(true, EdenError.SUCCESS, position);
                         }
                     }
 
                     @Override
-                    public void onFailure(Throwable e, String errMsg) {
+                    public void onFailure(int code, Throwable e, String errMsg) {
                         if (getView() != null) {
                             getView().onRevertGoodsEnable(false, EdenError.COMMON, position);
                         }

app/src/main/java/com/miekir/eden/ui/home/goods/detail/SeePresenter.java

@@ -34,14 +34,14 @@ public class SeePresenter extends BasePresenter<ISeeView> {
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new BaseObserver<Void>() {
                     @Override
-                    public void onSuccess(Void v) {
+                    public void onSuccess(int code, Void v) {
                         if (getView() != null) {
 
                         }
                     }
 
                     @Override
-                    public void onFailure(Throwable e, String errMsg) {
+                    public void onFailure(int code, Throwable e, String errMsg) {
                         if (getView() != null) {
 
                         }
@@ -75,14 +75,14 @@ public class SeePresenter extends BasePresenter<ISeeView> {
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new BaseObserver<Map<String, Object>>() {
                     @Override
-                    public void onSuccess(Map<String, Object> result) {
+                    public void onSuccess(int code, Map<String, Object> result) {
                         if (getView() != null) {
                             getView().onGetTorrentSecretResult(true, result);
                         }
                     }
 
                     @Override
-                    public void onFailure(Throwable e, String errMsg) {
+                    public void onFailure(int code, Throwable e, String errMsg) {
                         if (getView() != null) {
                             getView().onGetTorrentSecretResult(false, null);
                         }

app/src/main/java/com/miekir/eden/ui/home/search/SearchPresenter.java

@@ -29,14 +29,14 @@ public class SearchPresenter extends BasePresenter<ISearchView> {
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new BaseObserver<List<GoodsBean>>() {
                     @Override
-                    public void onSuccess(List<GoodsBean> result) {
+                    public void onSuccess(int code, List<GoodsBean> result) {
                         if (getView() != null) {
                             getView().onSearchKeywordResult(true, EdenError.SUCCESS, result);
                         }
                     }
 
                     @Override
-                    public void onFailure(Throwable e, String errMsg) {
+                    public void onFailure(int code, Throwable e, String errMsg) {
                         if (getView() != null) {
                             getView().onSearchKeywordResult(false, EdenError.COMMON, null);
                         }

app/src/main/java/com/miekir/eden/ui/home/tool/SystemPresenter.java

@@ -33,14 +33,14 @@ public class SystemPresenter extends BasePresenter<ISystemView> {
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new BaseObserver<SystemBean>() {
                     @Override
-                    public void onSuccess(SystemBean result) {
+                    public void onSuccess(int code, SystemBean result) {
                         if (getView() != null) {
                             getView().onGetConfigResult(true, EdenError.SUCCESS, result);
                         }
                     }
 
                     @Override
-                    public void onFailure(Throwable e, String errMsg) {
+                    public void onFailure(int code, Throwable e, String errMsg) {
                         if (getView() != null) {
                             getView().onGetConfigResult(false, EdenError.COMMON, null);
                         }
@@ -60,14 +60,14 @@ public class SystemPresenter extends BasePresenter<ISystemView> {
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new BaseObserver<String>() {
                     @Override
-                    public void onSuccess(String result) {
+                    public void onSuccess(int code, String result) {
                         if (getView() != null) {
                             getView().onSetConfigResult(configType, true, EdenError.SUCCESS, newZFB);
                         }
                     }
 
                     @Override
-                    public void onFailure(Throwable e, String errMsg) {
+                    public void onFailure(int code, Throwable e, String errMsg) {
                         if (getView() != null) {
                             getView().onSetConfigResult(configType, false, EdenError.COMMON, newZFB);
                         }
@@ -86,14 +86,14 @@ public class SystemPresenter extends BasePresenter<ISystemView> {
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new BaseObserver<String>() {
                     @Override
-                    public void onSuccess(String result) {
+                    public void onSuccess(int code, String result) {
                         if (getView() != null) {
                             getView().onSetVipResult(true, EdenError.SUCCESS);
                         }
                     }
 
                     @Override
-                    public void onFailure(Throwable e, String errMsg) {
+                    public void onFailure(int code, Throwable e, String errMsg) {
                         if (getView() != null) {
                             getView().onSetVipResult(false, EdenError.COMMON);
                         }

app/src/main/java/com/miekir/eden/ui/mine/fav/FavPresenter.java

@@ -29,14 +29,14 @@ public class FavPresenter extends BasePresenter<IFavView> {
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new BaseObserver<String>() {
                     @Override
-                    public void onSuccess(String result) {
+                    public void onSuccess(int code, String result) {
                         if (getView() != null) {
                             getView().onFavResult(true, EdenError.SUCCESS);
                         }
                     }
 
                     @Override
-                    public void onFailure(Throwable e, String errMsg) {
+                    public void onFailure(int code, Throwable e, String errMsg) {
                         if (getView() != null) {
                             getView().onFavResult(false, EdenError.COMMON);
                         }

app/src/main/java/com/miekir/eden/ui/mine/fav/MyFavPresenter.java

@@ -32,14 +32,14 @@ public class MyFavPresenter extends BasePresenter<IMyFavView> {
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new BaseObserver<List<GoodsBean>>() {
                     @Override
-                    public void onSuccess(List<GoodsBean> result) {
+                    public void onSuccess(int code, List<GoodsBean> result) {
                         if (getView() != null) {
                             getView().onGoodsDataCome(true, EdenError.SUCCESS, result);
                         }
                     }
 
                     @Override
-                    public void onFailure(Throwable e, String errMsg) {
+                    public void onFailure(int code, Throwable e, String errMsg) {
                         if (getView() != null) {
                             getView().onGoodsDataCome(false, EdenError.COMMON, null);
                         }

app/src/main/java/com/miekir/eden/ui/mine/login/LoginPresenter.java

@@ -25,14 +25,14 @@ public class LoginPresenter extends BasePresenter<ILoginView> {
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new BaseObserver<BeiUser>() {
                     @Override
-                    public void onSuccess(BeiUser result) {
+                    public void onSuccess(int code, BeiUser result) {
                         if (getView() != null) {
                             getView().onLoginResult(result, EdenError.SUCCESS);
                         }
                     }
 
                     @Override
-                    public void onFailure(Throwable e, String errMsg) {
+                    public void onFailure(int code, Throwable e, String errMsg) {
                         if (getView() != null) {
                             getView().onLoginResult(null, EdenError.COMMON);
                         }

app/src/main/java/com/miekir/eden/ui/welcome/WelcomePresenter.java

@@ -26,14 +26,14 @@ public class WelcomePresenter extends BasePresenter<ILoginView> {
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new BaseObserver<BeiUser>() {
                     @Override
-                    public void onSuccess(BeiUser result) {
+                    public void onSuccess(int code, BeiUser result) {
                         if (getView() != null) {
                             getView().onLoginResult(result, EdenError.SUCCESS);
                         }
                     }
 
                     @Override
-                    public void onFailure(Throwable e, String errMsg) {
+                    public void onFailure(int code, Throwable e, String errMsg) {
                         if (getView() != null) {
                             getView().onLoginResult(null, EdenError.COMMON);
                         }

network/src/main/java/com/miekir/network/constant/Code.java

@@ -6,7 +6,8 @@ package com.miekir.network.constant;
  */
 
 public class Code {
-    public static final int ERROR = -1;
+
+    public static final int COMMON = -1;
     public static final int SUCCESS = 0;
 
     /**

network/src/main/java/com/miekir/network/core/base/BaseObserver.java

@@ -18,15 +18,15 @@ public abstract class BaseObserver<T> implements Observer<BaseResponse<T>> {
     public void onNext(@NonNull BaseResponse<T> response) {
         try {
             if (response.getCode() == Code.SUCCESS) {
-                onSuccess(response.getContent());
+                onSuccess(response.getCode(), response.getContent());
             } else if (response.getCode() == Code.TOKEN_TIMEOUT) {
                 // 重新登录
             } else {
-                onFailure(new Exception(response.getMessage()), response.getMessage());
+                onFailure(response.getCode(), new Exception(response.getMessage()), response.getMessage());
             }
         } catch (Exception e) {
             e.printStackTrace();
-            onFailure(new Exception("null"), null);
+            onFailure(Code.COMMON, new Exception("null"), null);
         }
     }
 
@@ -34,7 +34,7 @@ public abstract class BaseObserver<T> implements Observer<BaseResponse<T>> {
     public void onError(@NonNull Throwable e) {
 
         e.printStackTrace();
-        onFailure(e, ExceptionUtil.exceptionHandler(e));
+        onFailure(Code.COMMON, e, ExceptionUtil.exceptionHandler(e));
     }
 
     @Override
@@ -47,7 +47,7 @@ public abstract class BaseObserver<T> implements Observer<BaseResponse<T>> {
 
     }
 
-    public abstract void onSuccess(T result);
+    public abstract void onSuccess(int code, T result);
 
-    public abstract void onFailure(Throwable e, String errMsg);
+    public abstract void onFailure(int code, Throwable e, String errMsg);
 }