feat:修改拦截器逻辑

Author: wangshuwen15222

app/src/main/java/cn/cheney/app/MainActivity.java

@@ -46,6 +46,11 @@ public void onError(int code, String message) {
 
                         }
 
+                        @Override
+                        public void hasIntercept() {
+
+                        }
+
                         @Override
                         public void notFound() {
                         }

gradle.properties

@@ -18,8 +18,8 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 
-debug = true
+debug = false
 pluginVersion = 1.0.8
 annotationVersion = 1.0.8
 compilerVersion = 1.0.8
-coreVersion = 1.0.8
+coreVersion = 1.0.9

publish-mavencentral.gradle

@@ -44,7 +44,7 @@ publishing {
             version PUBLISH_VERSION
 
             if (isAar) {
-                artifact("$buildDir/outputs/aar/${project.getName()}.aar")
+                artifact("$buildDir/outputs/aar/${project.getName()}-release.aar")
                 artifact androidSourcesJar
             } else {
                 artifact("$buildDir/libs/${project.getName()}.jar")

xrouter_annotation/src/main/java/cn/cheney/xrouter/annotation/XInterceptor.java

@@ -13,5 +13,8 @@
 
     String[] modules() default {};
 
+    /**
+     * 优先级 值越大 越先触发
+     */
     int priority() default 0;
 }

xrouter_core/src/main/java/cn/cheney/xrouter/core/XRouter.java

@@ -158,11 +158,14 @@ public Object proceed(BaseCall<?> call, RouteCallback callback) {
                 if (null != callback) {
                     callback.notFound();
                 }
-            } else {
+            } else if (e.getCode() == RouterException.HAS_INTERCEPT) {
                 if (null != callback) {
-                    callback.onError(e.getCode(), e.getMessage());
+                    callback.hasIntercept();
                 }
             }
+            if (null != callback) {
+                callback.onError(e.getCode(), e.getMessage());
+            }
         }
         return value;
     }

xrouter_core/src/main/java/cn/cheney/xrouter/core/callback/RouteCallback.java

@@ -8,6 +8,8 @@ public void onResult(Map<String, Object> result){}
 
     public  void notFound(){}
 
+    public  void hasIntercept(){}
+
     public void onError(int code, String message){}
 
 }

xrouter_core/src/main/java/cn/cheney/xrouter/core/exception/RouterException.java

@@ -13,9 +13,10 @@ public RouterException(int code,String message) {
 
     public static final int NOT_INIT = -100;
     public static final int NOT_FOUND = -1000;
-    public static final int INVOKE_ERROR = -1002;
     public static final int UN_KNOWN = -1001;
-    public static final int UN_SUPPORT_EXTRA_TYPE = -1001;
+    public static final int INVOKE_ERROR = -1002;
+    public static final int UN_SUPPORT_EXTRA_TYPE = -1003;
+    public static final int HAS_INTERCEPT = -1004;
 
 
     private int code;

xrouter_core/src/main/java/cn/cheney/xrouter/core/interceptor/Chain.java

@@ -11,4 +11,6 @@ public interface Chain {
      * @return value
      */
     Object proceed();
+
+    void stop();
 }

xrouter_core/src/main/java/cn/cheney/xrouter/core/interceptor/InterceptorManager.java

@@ -71,6 +71,8 @@ public List<RouterInterceptor> getInterceptorList(String module, String path) {
                             interceptorList.add(interceptor);
                         }
                         interceptorCacheMap.put(clazz, interceptor);
+                    }else {
+                        interceptorList.add(interceptor);
                     }
                 } catch (Exception e) {
                     e.printStackTrace();

xrouter_core/src/main/java/cn/cheney/xrouter/core/interceptor/RealChain.java

@@ -3,6 +3,7 @@
 import java.util.List;
 
 import cn.cheney.xrouter.core.call.BaseCall;
+import cn.cheney.xrouter.core.exception.RouterException;
 import cn.cheney.xrouter.core.util.Logger;
 
 public class RealChain implements Chain {
@@ -13,6 +14,8 @@ public class RealChain implements Chain {
 
     private int index = -1;
 
+    private boolean stop = false;
+
     public RealChain(BaseCall<?> call, List<RouterInterceptor> interceptorList) {
         this.call = call;
         this.interceptorList = interceptorList;
@@ -25,6 +28,11 @@ public BaseCall<?> call() {
 
     @Override
     public Object proceed() {
+        if (stop) {
+            //可以再次做拦截记录
+            Logger.d("uri=" + call.getUri().toString() + " has been intercept");
+            throw new RouterException(RouterException.HAS_INTERCEPT);
+        }
         index++;
         RouterInterceptor routerInterceptor = null;
         if (index <= interceptorList.size() - 1) {
@@ -37,4 +45,10 @@ public Object proceed() {
         return null;
     }
 
+    @Override
+    public void stop() {
+        stop = true;
+        proceed();
+    }
+
 }