* 优化代码

eajon · Jan 22, 2019 · 5375e12 · 5375e12
1 parent f8929d6
commit 5375e12
Showing 1 changed file with 2 additions and 10 deletions.
diff --git a/RxHttp/src/main/java/com/github/eajon/function/RetryExceptionFunction.java b/RxHttp/src/main/java/com/github/eajon/function/RetryExceptionFunction.java
@@ -17,7 +17,6 @@
 package com.github.eajon.function;
 
 
-import com.github.eajon.exception.ApiException;
 import com.github.eajon.util.LoggerUtils;
 
 import java.net.ConnectException;
@@ -50,7 +49,7 @@ public RetryExceptionFunction(int count) {
 
 
     @Override
-    public Observable  apply(@NonNull Observable <? extends Throwable> observable) throws Exception {
+    public Observable apply(@NonNull Observable<? extends Throwable> observable) {
         return observable.zipWith(Observable.range(1, count + 1), new BiFunction <Throwable, Integer, Wrapper>() {
             @Override
             public Wrapper apply(@NonNull Throwable throwable, @NonNull Integer integer) throws Exception {
@@ -59,17 +58,10 @@ public Wrapper apply(@NonNull Throwable throwable, @NonNull Integer integer) thr
         }).flatMap(new Function <Wrapper, ObservableSource <?>>() {
             @Override
             public ObservableSource <?> apply(@NonNull Wrapper wrapper) throws Exception {
-                if (wrapper.index > 1)
+                if (wrapper.index > 1) {
                     LoggerUtils.info("retryTime：" + (wrapper.index));
-                int errCode = 0;
-                if (wrapper.throwable instanceof ApiException) {
-                    ApiException exception = (ApiException) wrapper.throwable;
-                    errCode = exception.getCode();
                 }
                 if ((wrapper.throwable instanceof ConnectException
-                        || wrapper.throwable instanceof SocketTimeoutException
-                        || errCode == ApiException.ERROR.NETWORD_ERROR
-                        || errCode == ApiException.ERROR.TIMEOUT_ERROR
                         || wrapper.throwable instanceof SocketTimeoutException
                         || wrapper.throwable instanceof TimeoutException)
                         && wrapper.index < count + 1) { //如果超出重试次数也抛出错误，否则默认是会进入onCompleted